# HG changeset patch # User Andrew Shadura # Date 1501158374 -7200 # Node ID 880e2f07651b3eaf88d01e71ac7f3cbf88df163c # Parent a48802bf7134e5270f48eb05e10ccd375366cba9 i18n: regenerate translations diff -r a48802bf7134 -r 880e2f07651b kallithea/i18n/be/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po Thu Jul 27 03:02:37 2017 +0200 +++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po Thu Jul 27 14:26:14 2017 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2016-03-14 16:51+0100\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: 2017-06-03 21:48+0000\n" "Last-Translator: Viktar Vauchkevich \n" "Language-Team: Belarusian " @@ -20,79 +20,100 @@ "4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 2.15-dev\n" -#: kallithea/controllers/changelog.py:85 -#: kallithea/controllers/pullrequests.py:240 kallithea/lib/base.py:515 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "Яшчэ не было змен" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "Нічога" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:198 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "(зачынена)" -#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "Паказваць прабелы" -#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 msgid "Ignore whitespace" msgstr "Ігнараваць прабелы" -#: kallithea/controllers/changeset.py:168 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Павялічыць кантэкст да %(num)s радкоў" -#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:744 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "Няма такой рэвізіі ў гэтым рэпазітары" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "Выбраць набор змен" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "Перайсці на верхавіну рэпазітара" + +#: kallithea/controllers/compare.py:73 +#, fuzzy +#| msgid "Cannot compare repositories without using common ancestor" +msgid "Cannot compare repositories of different types" +msgstr "Немагчыма параўноўваць рэпазітары без агульнага продка" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "Немагчыма параўноўваць рэпазітары без агульнага продка" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 msgid "No response" msgstr "Няма адказу" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "Невядомая памылка" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "Запыт не распазнаны серверам з-за няправільнага сінтаксісу." -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Несанкцыянаваны доступ да рэсурсу" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "У вас няма правоў для прагляду гэтай старонкі" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "Рэсурс не знойдзены" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -100,369 +121,393 @@ "Сервер не можа выканаць запыт з-за нечаканых умоваў, якія ўзніклі падчас " "яго спрацавання." -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "Змены ў рэпазітары %s" - -#: kallithea/controllers/feed.py:56 +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 +#: kallithea/templates/changeset/changeset.html:195 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 +msgid "Changeset was too big and was cut off..." +msgstr "Змены апынуліся занадта вялікімі і былі скарочаныя..." + +#: kallithea/controllers/feed.py:84 +#, python-format +msgid "%s committed on %s" +msgstr "%s выканаў каміт у %s" + +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 #, python-format msgid "%s %s feed" msgstr "Стужка навін %s %s" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 -msgid "Changeset was too big and was cut off..." -msgstr "Змены апынуліся занадта вялікімі і былі скарочаныя..." - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "%s выканаў каміт у %s" - -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 +#, python-format +msgid "Changes on %s repository" +msgstr "Змены ў рэпазітары %s" + +#: kallithea/controllers/files.py:93 msgid "Click here to add new file" msgstr "Націсніце каб дадаць новы файл" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "Няма файлаў. %s" -#: kallithea/controllers/files.py:195 +#: kallithea/controllers/files.py:191 #, python-format msgid "%s at %s" msgstr "%s (%s)" -#: kallithea/controllers/files.py:307 kallithea/controllers/files.py:367 -#: kallithea/controllers/files.py:434 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Рэпазітар заблакаваў %s у %s" -#: kallithea/controllers/files.py:319 +#: kallithea/controllers/files.py:309 msgid "You can only delete files with revision being a valid branch" msgstr "Вы можаце выдаляць файлы толькі ў рэвізіі, злучанай з існай галінай" -#: kallithea/controllers/files.py:330 +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Файл %s выдалены з дапамогай Kallithea" -#: kallithea/controllers/files.py:352 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "Файл %s выдалены" -#: kallithea/controllers/files.py:356 kallithea/controllers/files.py:422 -#: kallithea/controllers/files.py:503 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "Падчас каміта адбылася памылка" -#: kallithea/controllers/files.py:379 +#: kallithea/controllers/files.py:369 msgid "You can only edit files with revision being a valid branch" msgstr "Вы можаце рэдагаваць файлы толькі ў рэвізіі, злучанай з існай галінай" -#: kallithea/controllers/files.py:393 +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "Файл %s адрэдагаваны з дапамогай Kallithea" -#: kallithea/controllers/files.py:409 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "Без змен" -#: kallithea/controllers/files.py:418 kallithea/controllers/files.py:492 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "Змены захаваныя ў %s" -#: kallithea/controllers/files.py:445 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "Файл дададзены з дапамогай Kallithea" -#: kallithea/controllers/files.py:466 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "Пуста" -#: kallithea/controllers/files.py:470 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "Безназоўны" -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Размяшчэнне павінна быць адносным шляхам, і не можа ўтрымліваць \"..\" у " "шляхі" -#: kallithea/controllers/files.py:528 +#: kallithea/controllers/files.py:517 msgid "Downloads disabled" msgstr "Магчымасць спампоўваць адключаная" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:528 #, python-format msgid "Unknown revision %s" msgstr "Невядомая рэвізія %s" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "Пусты рэпазітар" -#: kallithea/controllers/files.py:543 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "Невядомы тып архіва" -#: kallithea/controllers/files.py:773 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "Набор змен" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "Галіны" -#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "Тэгі" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "Памылка падчас стварэння форка рэпазітара %s" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "Групы" -#: kallithea/controllers/home.py:94 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:479 -#: kallithea/templates/base/base.html:653 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "Рэпазітары" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "Галіна" -#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "Зачыненыя галіны" -#: kallithea/controllers/home.py:151 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "Тэгі" -#: kallithea/controllers/home.py:157 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "Закладкі" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "Публічны журнал" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:306 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "Журнал" -#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 msgid "Bad captcha" msgstr "Няслушная капча" -#: kallithea/controllers/login.py:150 +#: kallithea/controllers/login.py:148 +#, python-format msgid "You have successfully registered with %s" msgstr "Рэгістрацыя ў %s прайшла паспяхова" -#: kallithea/controllers/login.py:195 +#: kallithea/controllers/login.py:193 msgid "A password reset confirmation code has been sent" msgstr "Код для скідання пароля адпраўлены" -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:242 msgid "Invalid password reset token" msgstr "Няслушны код скідання пароля" -#: kallithea/controllers/login.py:249 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "Пароль абноўлены" -#: kallithea/controllers/pullrequests.py:123 -#, python-format -msgid "%s (closed)" -msgstr "%s (зачынена)" - -#: kallithea/controllers/pullrequests.py:151 -#: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 -msgid "Changeset" -msgstr "Змены" - -#: kallithea/controllers/pullrequests.py:172 -msgid "Special" -msgstr "Адмысловы" - -#: kallithea/controllers/pullrequests.py:173 -msgid "Peer branches" -msgstr "Галіны ўдзельніка" - -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 -msgid "Bookmarks" -msgstr "Закладкі" - -#: kallithea/controllers/pullrequests.py:312 -#, python-format -msgid "Error creating pull request: %s" -msgstr "Памылка пры стварэнні pull-запыту: %s" - -#: kallithea/controllers/pullrequests.py:358 -#: kallithea/controllers/pullrequests.py:505 -msgid "No description" -msgstr "Няма апісання" - -#: kallithea/controllers/pullrequests.py:365 -msgid "Successfully opened new pull request" -msgstr "Pull-запыт створаны паспяхова" - -#: kallithea/controllers/pullrequests.py:368 -#: kallithea/controllers/pullrequests.py:455 -#: kallithea/controllers/pullrequests.py:512 +#: kallithea/controllers/pullrequests.py:73 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "Няслушны рэцэнзент \"%s\"" -#: kallithea/controllers/pullrequests.py:371 -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:135 +#, python-format +msgid "%s (closed)" +msgstr "%s (зачынена)" + +#: kallithea/controllers/pullrequests.py:162 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 +msgid "Changeset" +msgstr "Змены" + +#: kallithea/controllers/pullrequests.py:183 +msgid "Special" +msgstr "Адмысловы" + +#: kallithea/controllers/pullrequests.py:184 +msgid "Peer branches" +msgstr "Галіны ўдзельніка" + +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 +msgid "Bookmarks" +msgstr "Закладкі" + +#: kallithea/controllers/pullrequests.py:326 +#, python-format +msgid "Error creating pull request: %s" +msgstr "Памылка пры стварэнні pull-запыту: %s" + +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 msgid "Error occurred while creating pull request" msgstr "Адбылася памылка пры стварэнні pull-запыту" -#: kallithea/controllers/pullrequests.py:403 -msgid "Missing changesets since the previous pull request:" -msgstr "Адсутныя рэвізіі адносна папярэдняга pull-запыту:" +#: kallithea/controllers/pullrequests.py:358 +msgid "Successfully opened new pull request" +msgstr "Pull-запыт створаны паспяхова" + +#: kallithea/controllers/pullrequests.py:381 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" +msgstr "Абнаўленне для pull-запыту створана" #: kallithea/controllers/pullrequests.py:410 #, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "Новыя рэвізіі на %s %s адносна папярэдняга pull-запыту:" - -#: kallithea/controllers/pullrequests.py:417 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "Гэты pull-запыт заснаваны на іншай рэвізіі %s, просты diff немагчымы." - -#: kallithea/controllers/pullrequests.py:426 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "Няма змен на %s %s адносна папярэдняй версіі." - -#: kallithea/controllers/pullrequests.py:464 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "Зачынены, заменены %s." - -#: kallithea/controllers/pullrequests.py:472 -msgid "Pull request update created" -msgstr "Абнаўленне для pull-запыту створана" - -#: kallithea/controllers/pullrequests.py:516 +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:414 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "Няма апісання" + +#: kallithea/controllers/pullrequests.py:439 msgid "Pull request updated" msgstr "Pull-запыт абноўлены" -#: kallithea/controllers/pullrequests.py:531 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "Pull-запыт паспяхова выдалены" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:491 +#, fuzzy, python-format +#| msgid "Changeset for %s %s not found in %s" +msgid "Revision %s not found in %s" +msgstr "Набор змен для %s %s не знойдзены ў %s" + +#: kallithea/controllers/pullrequests.py:518 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "Няма змен для абнаўлення гэтага pull-запыту." + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "Гэты pull-запыт ужо прыняты на галіну %s." -#: kallithea/controllers/pullrequests.py:599 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "Гэты pull-запыт быў зачынены і не можа быць абноўлены." -#: kallithea/controllers/pullrequests.py:617 -#, python-format -msgid "The following changes are available on %s:" +#: kallithea/controllers/pullrequests.py:552 +#, fuzzy, python-format +#| msgid "The following changes are available on %s:" +msgid "The following additional changes are available on %s:" msgstr "Гэтыя змены даступныя на %s:" -#: kallithea/controllers/pullrequests.py:621 -msgid "No changesets found for updating this pull request." +#: kallithea/controllers/pullrequests.py:556 +#, fuzzy +#| msgid "No changesets found for updating this pull request." +msgid "No additional changesets found for iterating on this pull request." msgstr "Няма змен для абнаўлення гэтага pull-запыту." -#: kallithea/controllers/pullrequests.py:629 +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Увага: Галіна %s мае яшчэ адну верхавіну: %s." -#: kallithea/controllers/pullrequests.py:635 -msgid "Git pull requests don't support updates yet." +#: kallithea/controllers/pullrequests.py:571 +#, fuzzy +#| msgid "Git pull requests don't support updates yet." +msgid "Git pull requests don't support iterating yet." msgstr "Абнаўленне pull-запытаў git яшчэ не падтрымліваецца." -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:573 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "Няма змен для абнаўлення гэтага pull-запыту." + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 msgid "No permission to change pull request status" msgstr "Няма правоў змяняць статус pull-запыту" -#: kallithea/controllers/pullrequests.py:738 +#: kallithea/controllers/pullrequests.py:676 #, python-format msgid "Successfully deleted pull request %s" msgstr "Pull-запыт %s паспяхова выдалены" -#: kallithea/controllers/pullrequests.py:748 -msgid "Closing." -msgstr "Зачынены." - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "Недапушчальны пошукавы запыт. Паспрабуйце скласці яго ў двукоссі." -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "Індэксы адсутнічаюць. Калі ласка, запусціце індэксатар Whoosh" -#: kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Памылка пры выкананні гэтага пошуку." -#: kallithea/controllers/summary.py:181 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 msgid "No data ready yet" msgstr "Няма дадзеных" -#: kallithea/controllers/summary.py:184 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "Статыстычныя дадзеныя адключаны для гэтага рэпазітара" @@ -474,151 +519,155 @@ msgid "error occurred during update of auth settings" msgstr "памылка пры абнаўленні налад аўтарызацыі" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "Стандартныя налады паспяхова абноўлены" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "Памылка пры абнаўленні стандартных налад" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 msgid "Forever" msgstr "Назаўжды" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "5 minutes" msgstr "5 хвілін" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 hour" msgstr "1 гадзіна" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 msgid "1 day" msgstr "1 дзень" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "1 месяц" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:290 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "Тэрмін" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "Адбылася памылка падчас стварэння gist-запіса" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "Gist-запіс %s выдалены" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:200 msgid "Unmodified" msgstr "Без змен" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "Gist-запіс абноўлены" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "Gist-запіс абноўлены" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "Памылка пры абнаўленні gist-запісу %s" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Вы не можаце змяніць дадзеныя гэтага карыстальніка, паколькі ён важны для" " працы ўсёй праграмы" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "Ваш уліковы запіс паспяхова абноўлены" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:201 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "Памылка пры абнаўленні карыстальніка %s" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "Памылка пры абнаўленні пароля" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "Карыстальніку дададзены e-mail %s" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "Памылка пры захаванні e-mail" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "E-mail карыстальніка выдалены" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "API-ключ паспяхова створаны" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "API-ключ паспяхова скінуты" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:324 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "API-ключ паспяхова выдалены" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "Чытанне" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" -msgstr "Запіс" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" +msgstr "Чытанне" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "Запіс" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -626,277 +675,294 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:336 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:344 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "Адміністратар" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "Адключана" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "Дазволена, з ручной актывацыяй уліковага запісу" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "Дазволена, з аўтаматычнай актывацыяй уліковага запісу" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1705 -msgid "Manual activation of external account" -msgstr "Ручная актывацыя вонкавага ўліковага запісу" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1706 -msgid "Automatic activation of external account" -msgstr "Аўтаматычная актывацыя вонкавага ўліковага запісу" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "Адключана" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "Дазволена, з ручной актывацыяй уліковага запісу" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "Дазволена, з аўтаматычнай актывацыяй уліковага запісу" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "Ручная актывацыя вонкавага ўліковага запісу" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "Аўтаматычная актывацыя вонкавага ўліковага запісу" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "Уключана" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "Глабальныя прывілеі паспяхова абноўленыя" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Адбылася памылка падчас абнаўлення прывілеяў" -#: kallithea/controllers/admin/repo_groups.py:187 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Адбылася памылка пры стварэнні групы рэпазітароў %s" -#: kallithea/controllers/admin/repo_groups.py:192 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "Створаная новая група рэпазітароў %s" -#: kallithea/controllers/admin/repo_groups.py:249 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "Група рэпазітароў %s абноўленая" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:248 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Адбылася памылка пры абнаўленні групы рэпазітароў %s" -#: kallithea/controllers/admin/repo_groups.py:283 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Група ўтрымлівае %s рэпазітароў і не можа быць выдаленая" -#: kallithea/controllers/admin/repo_groups.py:290 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Група ўтрымлівае ў сабе %s падгруп і не можа быць выдаленая" -#: kallithea/controllers/admin/repo_groups.py:296 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "Група рэпазітароў %s выдаленая" -#: kallithea/controllers/admin/repo_groups.py:301 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Памылка пры выдаленні групы рэпазітароў %s" -#: kallithea/controllers/admin/repo_groups.py:404 -#: kallithea/controllers/admin/repo_groups.py:439 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "Адміністратар не можа адклікаць свае прывелеі" -#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "Прывілеі групы рэпазітароў абноўленыя" -#: kallithea/controllers/admin/repo_groups.py:456 -#: kallithea/controllers/admin/repos.py:397 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "Памылка пры водгуку прывелея" -#: kallithea/controllers/admin/repos.py:151 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "Памылка пры стварэнні рэпазітара %s" -#: kallithea/controllers/admin/repos.py:212 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "Рэпазітар %s створаны з %s" -#: kallithea/controllers/admin/repos.py:221 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "Зроблены форк рэпазітара %s на %s" -#: kallithea/controllers/admin/repos.py:224 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "Рэпазітар %s створаны" -#: kallithea/controllers/admin/repos.py:261 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "Рэпазітар %s паспяхова абноўлены" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "Памылка падчас абнаўлення рэпазітара %s" -#: kallithea/controllers/admin/repos.py:309 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "Форкі %s адлучаныя" -#: kallithea/controllers/admin/repos.py:312 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "Выдаленыя форки рэпазітара %s" -#: kallithea/controllers/admin/repos.py:317 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "Рэпазітар %s выдалены" -#: kallithea/controllers/admin/repos.py:320 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Немагчыма выдаліць %s, ён усё яшчэ мае форкі" -#: kallithea/controllers/admin/repos.py:325 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "Памылка падчас выдалення %s" -#: kallithea/controllers/admin/repos.py:373 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "Прывілеі рэпазітара абноўленыя" -#: kallithea/controllers/admin/repos.py:429 -msgid "An error occurred during creation of field" +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, fuzzy, python-format +#| msgid "An error occurred during creation of field" +msgid "An error occurred during creation of field: %r" msgstr "Памылка пры стварэнні поля" -#: kallithea/controllers/admin/repos.py:443 +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "Памылка пры выдаленні поля" -#: kallithea/controllers/admin/repos.py:459 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "-- Не форк --" -#: kallithea/controllers/admin/repos.py:490 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "Бачнасць рэпазітара ў публічным часопісе абноўлена" -#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "Памылка пры даданні рэпазітара ў агульнадаступны часопіс" -#: kallithea/controllers/admin/repos.py:511 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "Нічога" -#: kallithea/controllers/admin/repos.py:513 +#: kallithea/controllers/admin/repos.py:473 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Рэпазітар %s адзначаны як форк %s" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:480 msgid "An error occurred during this operation" msgstr "Памылка пры выкананні аперацыі" -#: kallithea/controllers/admin/repos.py:536 -#: kallithea/controllers/admin/repos.py:563 +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 msgid "Repository has been locked" msgstr "Рэпазітар заблакаваны" -#: kallithea/controllers/admin/repos.py:539 -#: kallithea/controllers/admin/repos.py:560 +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 msgid "Repository has been unlocked" msgstr "Рэпазітар разблакаваны" -#: kallithea/controllers/admin/repos.py:542 -#: kallithea/controllers/admin/repos.py:567 +#: kallithea/controllers/admin/repos.py:502 +#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during unlocking" msgstr "Памылка падчас разблакавання" -#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:533 msgid "Cache invalidation successful" msgstr "Кэш скінуты" -#: kallithea/controllers/admin/repos.py:585 +#: kallithea/controllers/admin/repos.py:537 msgid "An error occurred during cache invalidation" msgstr "Памылка пры скіданні кэша" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "Занесеныя змены з аддаленага рэпазітара" -#: kallithea/controllers/admin/repos.py:603 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "Памылка пры занясенні змен з аддаленага рэпазітара" -#: kallithea/controllers/admin/repos.py:636 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "Адбылася памылка пры выдаленні статыстыкі рэпазітара" -#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "Абноўлены налады VCS" -#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -904,334 +970,348 @@ "Немагчыма ўключыць падтрымку hgsubversion. Бібліятэка hgsubversion " "адсутнічае" -#: kallithea/controllers/admin/settings.py:151 -#: kallithea/controllers/admin/settings.py:248 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "Памылка пры абнаўленні наладаў праграмы" -#: kallithea/controllers/admin/settings.py:187 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Рэпазітары паспяхова перасканаваныя, дададзена: %s, выдалена: %s." -#: kallithea/controllers/admin/settings.py:244 +#: kallithea/controllers/admin/settings.py:189 +#, python-format +msgid "Invalidated %s repositories" +msgstr "Скінуць кэш для %s рэпазітароў" + +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "Абноўленыя налады праграмы" -#: kallithea/controllers/admin/settings.py:301 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Налады візуалізацыі абноўленыя" -#: kallithea/controllers/admin/settings.py:306 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "Адбылася памылка пры абнаўленні наладаў візуалізацыі" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Калі ласка, увядзіце e-mail-адрас" -#: kallithea/controllers/admin/settings.py:347 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "Задача адпраўкі e-mail створаная" -#: kallithea/controllers/admin/settings.py:378 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "Дададзены новы хук" -#: kallithea/controllers/admin/settings.py:392 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "Абноўленыя хукі" -#: kallithea/controllers/admin/settings.py:396 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "Памылка пры стварэнні хука" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "Запланаванае пераіндэксаванне базы Whoosh" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "Створана група карыстальнікаў %s" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Памылка пры стварэнні групы карыстальнікаў %s" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "Група карыстальнікаў %s абноўленая" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:208 #, python-format msgid "Error occurred during update of user group %s" msgstr "Памылка пры абнаўленні групы карыстальнікаў %s" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:219 msgid "Successfully deleted user group" msgstr "Група карыстальнікаў паспяхова выдаленая" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:224 msgid "An error occurred during deletion of user group" msgstr "Памылка пры выдаленні групы карыстальнікаў" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "Мэтавая група не можа быць той жа самай" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "Прывілеі групы карыстальнікаў абноўленыя" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "Абноўленыя прывілеі" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "Памылка пры захаванні прывілеяў" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "Карыстальнік %s створаны" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "Памылка пры стварэнні карыстальніка %s" -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "Карыстальнік паспяхова абноўлены" -#: kallithea/controllers/admin/users.py:217 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "Карыстальнік паспяхова выдалены" -#: kallithea/controllers/admin/users.py:222 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "Памылка пры выдаленні карыстальніка" -#: kallithea/controllers/admin/users.py:235 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:462 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "Дададзены IP %s у белы спіс карыстальніка" -#: kallithea/controllers/admin/users.py:468 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "Адбылася памылка пры захаванні IP" -#: kallithea/controllers/admin/users.py:482 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "Выдалены IP %s з белага спісу карыстальніка" -#: kallithea/lib/auth.py:737 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "IP %s заблакаваны" -#: kallithea/lib/auth.py:750 -msgid "Invalid API key" -msgstr "Няслушны API-ключ" - -#: kallithea/lib/auth.py:768 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:813 +#: kallithea/lib/auth.py:829 msgid "You need to be a registered user to perform this action" msgstr "Вы павінны быць зарэгістраваным карыстальнікам, каб выканаць гэта дзеянне" -#: kallithea/lib/auth.py:843 +#: kallithea/lib/auth.py:857 msgid "You need to be signed in to view this page" msgstr "Старонка даступная толькі аўтарызаваным карыстальнікам" -#: kallithea/lib/base.py:493 +#: kallithea/lib/base.py:449 +msgid "Invalid API key" +msgstr "Няслушны API-ключ" + +#: kallithea/lib/base.py:508 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "Рэпазітар не знойдзены на файлавай сістэме" -#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:623 -msgid "Changeset not found" -msgstr "Набор змен не знойдзены" - -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/base.py:617 +#, python-format +msgid "Changeset for %s %s not found in %s" +msgstr "Набор змен для %s %s не знойдзены ў %s" + +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "Двайковы файл" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Набор змены апынуўся занадта вялікімі і быў падрэзаны, выкарыстоўвайце " "меню параўнання для паказу выніку параўнання" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "Змен не выяўлена" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "Выдаленая галіна: %s" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "Створаны тэг: %s" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:613 +#, python-format +msgid "Changeset %s not found" +msgstr "Набор змен %s не знойдзены" + +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Паказаць адрозненні разам %s->%s" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 msgid "Compare view" msgstr "Параўнанне" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "і" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "на %s больш" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "версіі" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, python-format msgid "Fork name %s" msgstr "Імя форка %s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, python-format msgid "Pull request %s" msgstr "Pull-запыт %s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "[выдалены] рэпазітар" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 msgid "[created] repository" msgstr "[створаны] рэпазітар" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "[створаны] рэпазітар як форк" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "[форкнуты] рэпазітар" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "[абноўлены] рэпазітар" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "[загружаны] архіў з рэпазітара" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "[выдалены] рэпазітар" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "[створаны] карыстальнік" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "[абноўлены] карыстальнік" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "[створана] група карыстальнікаў" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "[абноўлена] група карыстальнікаў" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "[каментар] да рэвізіі ў рэпазітары" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "[каментар] у pull-запыце для" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "[зачынены] pull-запыт для" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "[адпраўлена] у" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "[каміт праз Kallithea] у рэпазітары" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "[занесены з аддаленага рэпазітара] у рэпазітар" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "[занесены] з" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "[дададзены ў назіранні] рэпазітар" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "[выдалены з назірання] рэпазітар" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr " і на %s больш" -#: kallithea/lib/helpers.py:1128 -#: kallithea/templates/compare/compare_diff.html:71 -#: kallithea/templates/pullrequests/pullrequest_show.html:337 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "Няма файлаў" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "новы файл" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "зменены" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "выдалены" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "пераназваны" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1469 +#: kallithea/lib/helpers.py:1230 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1242,7 +1322,7 @@ "пераназваны з файлавай сістэмы. Калі ласка, перазапусціце прыкладанне для" " сканавання рэпазітароў" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1250,7 +1330,7 @@ msgstr[1] "%d гады" msgstr[2] "%d гадоў" -#: kallithea/lib/utils2.py:435 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1258,7 +1338,7 @@ msgstr[1] "%d месяцы" msgstr[2] "%d месяцаў" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1266,7 +1346,7 @@ msgstr[1] "%d дні" msgstr[2] "%d дзён" -#: kallithea/lib/utils2.py:437 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1274,7 +1354,7 @@ msgstr[1] "%d гадзіны" msgstr[2] "%d гадзін" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1282,7 +1362,7 @@ msgstr[1] "%d хвіліны" msgstr[2] "%d хвілін" -#: kallithea/lib/utils2.py:439 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1290,692 +1370,355 @@ msgstr[1] "%d секунды" msgstr[2] "%d секунд" -#: kallithea/lib/utils2.py:455 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "у %s" -#: kallithea/lib/utils2.py:457 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "%s назад" -#: kallithea/lib/utils2.py:459 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "у %s і %s" -#: kallithea/lib/utils2.py:462 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "%s і %s назад" -#: kallithea/lib/utils2.py:465 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "цяпер" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "Рэпазітар - няма доступу" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "Рэпазітар - доступ на чытанне" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "Рэпазітар - доступ на запіс" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "Рэпазітар - адміністраванне" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "Група Рэпазітароў - няма доступу" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "Група Рэпазітароў - доступ на чытанне" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "Група Рэпазітароў - доступ на запіс" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "Група Рэпазітароў - адміністраванне" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1669 -msgid "Kallithea Administrator" -msgstr "Адміністратар Kallithea" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "Стварэнне рэпазітароў адключанае" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "Стварэнне рэпазітароў уключанае" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "Магчымасць ствараць форк рэпазітара адключаная" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "Магчымасць ствараць форк рэпазітара ўключаная" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "Рэгістрацыя адключаная" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "Рэгістрацыя новага карыстальніка ў Kallithea з ручной актывацыяй" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "Рэгістрацыя новага карыстальніка ў Kallithea з аўтаматычнай актывацыяй" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "Не прагледжана" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2237 -msgid "Approved" -msgstr "Ухвалена" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2238 -msgid "Rejected" -msgstr "Адхілена" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "На разглядзе" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1518 -msgid "top level" -msgstr "верхні ўзровень" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "Група Рэпазітароў - няма доступу" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "Група рэпазітароў - доступ на чытанне" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "Група рэпазітароў - доступ на запіс" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "Група рэпазітароў - адміністраванне" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "Група карыстальнікаў - няма доступу" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "Група карыстальнікаў - доступ на чытанне" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "Група карыстальнікаў - доступ на запіс" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "Група карыстальнікаў - адміністраванне" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "Стварэнне груп рэпазітароў адключанае" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "Стварэнне груп рэпазітароў уключанае" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "Стварэнне груп карыстальнікаў адключанае" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "Стварэнне груп карыстальнікаў уключанае" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1701 -msgid "Registration disabled" -msgstr "Рэгістрацыя адключаная" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "Рэгістрацыя карыстальніка з ручной актывацыяй уліковага запісу" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "Рэгістрацыя карыстальніка з аўтаматычнай актывацыяй" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1695 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1696 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "на радку %s" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "[Згадванне]" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "верхні ўзровень" + +#: kallithea/model/db.py:1715 +msgid "Kallithea Administrator" +msgstr "Адміністратар Kallithea" + +#: kallithea/model/db.py:1717 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 +#: kallithea/model/db.py:1718 +#, fuzzy msgid "Default user has read access to new repositories" -msgstr "" - -#: kallithea/model/db.py:1673 +msgstr "Несанкцыянаваны доступ да рэсурсу" + +#: kallithea/model/db.py:1719 +#, fuzzy msgid "Default user has write access to new repositories" -msgstr "" - -#: kallithea/model/db.py:1674 +msgstr "Несанкцыянаваны доступ да рэсурсу" + +#: kallithea/model/db.py:1720 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1722 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 +#: kallithea/model/db.py:1723 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1724 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1725 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1727 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1728 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1729 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1730 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1732 msgid "Only admins can create repository groups" msgstr "Толькі адміністратары могуць ствараць групы репазітароў" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1733 msgid "Non-admins can create repository groups" msgstr "Неадміністратары могуць ствараць групы репазітароў" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1735 msgid "Only admins can create user groups" msgstr "Толькі адміністратары могуць ствараць групы карыстальнікаў" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1736 msgid "Non-admins can create user groups" msgstr "Неадміністратары могуць ствараць групы карыстальнікаў" -#: kallithea/model/db.py:1692 +#: kallithea/model/db.py:1738 msgid "Only admins can create top level repositories" msgstr "Толькі адміністратары могуць ствараць рэпазітары верхняга ўзроўню" -#: kallithea/model/db.py:1693 +#: kallithea/model/db.py:1739 msgid "Non-admins can create top level repositories" msgstr "Неадміністратары могуць ствараць рэпазітары верхняга ўзроўню" -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1741 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1742 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1744 msgid "Only admins can fork repositories" msgstr "Месцазнаходжанне рэпазітароў" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1745 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1702 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "Рэгістрацыя адключаная" + +#: kallithea/model/db.py:1748 msgid "User registration with manual account activation" msgstr "Рэгістрацыя карыстальніка з ручной актывацыяй уліковага запісу" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1749 msgid "User registration with automatic account activation" msgstr "Рэгістрацыя карыстальніка з аўтаматычнай актывацыяй" -#: kallithea/model/db.py:2236 +#: kallithea/model/db.py:2276 msgid "Not reviewed" msgstr "Не прагледжана" -#: kallithea/model/db.py:2239 +#: kallithea/model/db.py:2277 msgid "Under review" msgstr "На разглядзе" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2278 +#, fuzzy +#| msgid "Approved" +msgid "Not approved" +msgstr "Ухвалена" + +#: kallithea/model/db.py:2279 +msgid "Approved" +msgstr "Ухвалена" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "Калі ласка, увядзіце лагін" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Увядзіце значэнне даўжынёй не меней %(min)i знакаў" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "Калі ласка, увядзіце пароль" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "Увядзіце не меней %(min)i знакаў" -#: kallithea/model/forms.py:165 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "Імя не можа ўтрымліваць толькі лічбы" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:240 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s пакінуў каментар да набору змен %(age)s" -#: kallithea/model/notification.py:255 +#: kallithea/model/notification.py:241 #, python-format msgid "%(user)s sent message %(age)s" msgstr "%(user)s адправіў паведамленне %(age)s" -#: kallithea/model/notification.py:256 +#: kallithea/model/notification.py:242 #, python-format msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s згадаў вас %(age)s" -#: kallithea/model/notification.py:257 +#: kallithea/model/notification.py:243 #, python-format msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s зарэгістраваўся ў Kallithea %(age)s" -#: kallithea/model/notification.py:258 +#: kallithea/model/notification.py:244 #, python-format msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s адкрыў новы pull-запыт %(age)s" -#: kallithea/model/notification.py:259 +#: kallithea/model/notification.py:245 #, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s пакінуў каментар да pull-запыту %(age)s" -#: kallithea/model/notification.py:266 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s пакінуў каментар да набору змен %(when)s" -#: kallithea/model/notification.py:267 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s адправіў паведамленне %(when)s" -#: kallithea/model/notification.py:268 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s згадаў вас %(when)s" -#: kallithea/model/notification.py:269 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s зарэгістраваўся ў Kallithea %(when)s" -#: kallithea/model/notification.py:270 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s адкрыў новы pull-запыт %(when)s" -#: kallithea/model/notification.py:271 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s пакінуў каментар да pull-запыту %(when)s" -#: kallithea/model/notification.py:302 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:288 +#, fuzzy, python-format +#| msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "[пракаментавана] у запыце на занясенне змен для" + +#: kallithea/model/notification.py:291 #, python-format msgid "New user %(new_username)s registered" msgstr "Новы карыстальнік \"%(new_username)s\" зарэгістраваны" +#: kallithea/model/notification.py:293 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:307 -#, fuzzy, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "%(user)s просіць вас разгледзець pull request %(pr_nice_id)s: %(pr_title)s" - -#: kallithea/model/notification.py:308 -#, fuzzy, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "[пракаментавана] у запыце на занясенне змен для" - -#: kallithea/model/notification.py:321 msgid "Closing" msgstr "Зачынены" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "%(user)s просіць вас разгледзець pull request %(pr_nice_id)s: %(pr_title)s" -#: kallithea/model/scm.py:708 +#: kallithea/model/pull_request.py:211 +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Cannot create empty pull request" +msgstr "Памылка пры стварэнні pull-запыту: %s" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +#, fuzzy +#| msgid "Confirm to delete this pull request" +msgid "You are not authorized to create the pull request" +msgstr "Пацвердзіце выдаленне гэтага pull-request'а" + +#: kallithea/model/pull_request.py:341 +#, fuzzy +#| msgid "Missing changesets since the previous pull request:" +msgid "Missing changesets since the previous iteration:" +msgstr "Адсутныя рэвізіі адносна папярэдняга pull-запыту:" + +#: kallithea/model/pull_request.py:348 +#, fuzzy, python-format +#| msgid "New changesets on %s %s since the previous pull request:" +msgid "New changesets on %s %s since the previous iteration:" +msgstr "Новыя рэвізіі на %s %s адносна папярэдняга pull-запыту:" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, fuzzy, python-format +#| msgid "" "This pull request is based on another %s revision and there is no +#| simple " "diff." +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "Гэты pull-запыт заснаваны на іншай рэвізіі %s, просты diff немагчымы." + +#: kallithea/model/pull_request.py:364 +#, fuzzy, python-format +#| msgid "No changes found on %s %s since previous version." +msgid "No changes found on %s %s since previous iteration." +msgstr "Няма змен на %s %s адносна папярэдняй версіі." + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "апошняя версія" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "Рэгістрацыя новага карыстальніка" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" "Вы не можаце выдаліць карыстальніка, паколькі гэта крытычна для працы " "ўсёй праграмы" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1985,7 +1728,7 @@ "таму не можа быць выдалены. Змяніце ўладальніка ці выдаліце гэтыя " "рэпазітары: %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" @@ -1995,7 +1738,7 @@ "і таму не можа быць выдалены. Змяніце ўладальніка ці выдаліце гэтая " "групы: %s" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -2005,36 +1748,36 @@ "карыстальнікаў і таму не можа быць выдалены. Змяніце ўладальніка ці " "выдаліце гэтыя групы: %s" -#: kallithea/model/user.py:368 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "Спасылка скіду пароля" -#: kallithea/model/user.py:418 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "Паведамленне пра скіданне пароля" -#: kallithea/model/user.py:419 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "Значэнне не можа быць пустым спісам" -#: kallithea/model/validators.py:96 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Карыстальнік з імем \"%(username)s\" ужо існуе" -#: kallithea/model/validators.py:98 +#: kallithea/model/validators.py:75 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Імя \"%(username)s\" недапушчальнае" -#: kallithea/model/validators.py:100 +#: kallithea/model/validators.py:77 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" @@ -2043,25 +1786,25 @@ "падкрэслення, кропкі і працяжнік; а гэтак жа павінна пачынацца з літары, " "лічбы або са знака падкрэслення" -#: kallithea/model/validators.py:127 +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:134 +#: kallithea/model/validators.py:111 #, python-format msgid "Username %(username)s is not valid" msgstr "Імя \"%(username)s\" недапушчальнае" -#: kallithea/model/validators.py:154 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "Няслушнае імя групы карыстальнікаў" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:132 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Група карыстальнікаў \"%(usergroup)s\" ужо існуе" -#: kallithea/model/validators.py:157 +#: kallithea/model/validators.py:134 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -2070,65 +1813,65 @@ "падкрэслення, кропкі і працяжнік; а гэтак жа павінна пачынацца з літары " "ці лічбы" -#: kallithea/model/validators.py:197 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "Немагчыма выкарыстоўваць гэту групу як бацькоўскую" -#: kallithea/model/validators.py:198 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Група \"%(group_name)s\" ужо існуе" -#: kallithea/model/validators.py:200 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Рэпазітар з імем \"%(group_name)s\" ужо існуе" -#: kallithea/model/validators.py:258 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "Недапушчальныя знакі (не ascii) у паролі" -#: kallithea/model/validators.py:273 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "Няслушна зададзены стары пароль" -#: kallithea/model/validators.py:289 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "Паролі не супадаюць" -#: kallithea/model/validators.py:304 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "Няслушнае імя ці пароль" -#: kallithea/model/validators.py:335 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "Несупадзенне токенаў" -#: kallithea/model/validators.py:351 +#: kallithea/model/validators.py:326 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "Імя рэпазітара %(repo)s забароненае" -#: kallithea/model/validators.py:353 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Рэпазітар %(repo)s ужо існуе" -#: kallithea/model/validators.py:354 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Рэпазітар \"%(repo)s\" ужо існуе ў групе \"%(group)s\"" -#: kallithea/model/validators.py:356 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Група рэпазітароў \"%(repo)s\" ужо існуе" -#: kallithea/model/validators.py:470 +#: kallithea/model/validators.py:449 msgid "Invalid repository URL" msgstr "Няслушны URL рэпазітара" -#: kallithea/model/validators.py:471 +#: kallithea/model/validators.py:450 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" @@ -2136,40 +1879,40 @@ "Няслушны URL рэпазітара. Ён мусіць быць карэктным URL http, https, ssh, " "svn+http ці svn+https" -#: kallithea/model/validators.py:496 +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "Тып форка будзе супадаць з бацькоўскім" -#: kallithea/model/validators.py:511 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "У вас недастаткова правоў для стварэння рэпазітароў у гэтай групе" -#: kallithea/model/validators.py:513 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "недастаткова правоў для стварэння рэпазітара ў каранёвым каталогу" -#: kallithea/model/validators.py:563 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "У Вас недастаткова прывілеяў для стварэння групы ў гэтым месцы" -#: kallithea/model/validators.py:604 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "Дадзенае імя карыстальніка ці групы карыстальнікаў недапушчальна" -#: kallithea/model/validators.py:697 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "Гэты шлях хібны" -#: kallithea/model/validators.py:714 +#: kallithea/model/validators.py:692 msgid "This email address is already in use" msgstr "Гэты e-mail ужо ўжываецца" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:712 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "Email-адрас \"%(email)s\" не знойдзены" -#: kallithea/model/validators.py:771 +#: kallithea/model/validators.py:749 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -2177,397 +1920,407 @@ "Для ўваходу па LDAP павінна быць паказана значэнне атрыбута CN - гэта " "эквівалент імя карыстальніка" -#: kallithea/model/validators.py:783 +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Калі ласка, увядзіце існы IPv4 ці IPv6 адрас" -#: kallithea/model/validators.py:784 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" "Значэнне маскі падсеткі павінна быць у межах ад 0 да 32 (%(bits)r - " "няслушна)" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" "Ключавое імя можа толькі складацца з літар, знака падкрэслення, працяжнік" " ці лікаў" -#: kallithea/model/validators.py:831 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "Файла няма ў каталогу" -#: kallithea/model/validators.py:847 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "Пра праграму" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "Панэль кіравання" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "фільтр..." - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "рэпазітары" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "Дадаць рэпазітар" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "Дадаць групу рэпазітароў" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "Вы маеце адміністратарскія правы на гэту групу і можаце рэдагаваць яе" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "Змяніць групу рэпазітароў" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "Імя групы" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +#, fuzzy +#| msgid "Repository group" +msgid "Repository Group" +msgstr "Група рэпазітароў" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "Апісанне" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "Імя" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "Рэпазітар" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "Апошняя змена" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" -msgstr "" - -#: kallithea/templates/index_base.html:132 +msgstr "Стан" + +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:244 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "Уладальнік" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "Па ўзрастанні" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "Па змяншэнні" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "Рэпазітары не знойдзеныя." - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "Памылка дадзеных." - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "Загрузка..." - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:414 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "Увайсці" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "Увайсці ў %s" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "Імя карыстальніка" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "Пароль" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "Запомніць" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "Забыліся на пароль?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "Няма акаўнта?" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "Увайсці" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "Скінуць пароль" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 #, python-format msgid "Reset Your Password to %s" msgstr "Забыліся на пароль для %s?" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 msgid "Reset Your Password" msgstr "Скінуць Ваш пароль" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "Паштовы адрас" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "Капча" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 msgid "Send Password Reset Email" msgstr "Паслаць спасылку для скідання пароля" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "" -"Спасылка для скіду пароля будзе адпраўленая на адпаведны email-адрас, калі " -"ён зарэгістраваны ў сістэме." - -#: kallithea/templates/password_reset_confirmation.html:19 +"Спасылка для скіду пароля будзе адпраўленая на адпаведны email-адрас, " +"калі ён зарэгістраваны ў сістэме." + +#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 msgid "New Password" msgstr "Новы пароль" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 msgid "Confirm New Password" msgstr "Пацвердзіце новы пароль" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "Рэгістрацыя" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "Рэгістрацыя на %s" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "Паўтарыце пароль" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "Імя" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "Прозвішча" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "E-mail" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "Калі ласка, пачакайце, пакуль адміністратар пацвердзіць Вашу рэгістрацыю." -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "Галіны яшчэ не створаныя" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "Пазнакі адсутнічаюць" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "Закладак яшчэ няма" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 msgid "Admin Journal" msgstr "Журнал адміністратара" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "Фільтр журнала..." #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 msgid "Filter" msgstr "Адфільтраваць" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2576,59 +2329,60 @@ msgstr[2] "%s запісы" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "Дзеянне" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "Рэпазітар" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "Дата" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "З IP" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "Няма інфармацыі" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "Налады аўтэнтыфікацыі" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "Аўтэнтыфікацыя" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "Плагіны аўтэнтыфікацыі" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "Уключаныя плагіны" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" @@ -2636,90 +2390,117 @@ "Спіс плагінаў, падзеленых коскамі. Kallithea будзе спрабаваць " "аўтэнтыфікаваць карыстальніка ў парадку ўказання плагінаў" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "Даступныя ўбудаваныя плагіны" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "Плагін" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "Захаваць" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 msgid "Repository Defaults" msgstr "Значэнні па змоўчанні" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "Тып" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 msgid "Private repository" msgstr "Прыватны рэпазітар" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "Прыватныя рэпазітары бачныя толькі іх удзельнікам." -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 msgid "Enable statistics" msgstr "Уключыць статыстыку" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 msgid "Enable statistics window on summary page." msgstr "Уключыць акно статыстыкі на старонцы «Агульныя звесткі»." -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 msgid "Enable downloads" msgstr "Уключыць спампоўку" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 msgid "Enable download menu on summary page." msgstr "Уключыць меню спампоўкі на старонцы «Агульныя звесткі»." -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 msgid "Enable locking" msgstr "Уключыць блакаванне" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "Уключыць аўтаблакаванне для рэпазітара." @@ -2728,317 +2509,470 @@ msgid "Edit Gist" msgstr "Правіць gist-запіс" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "Апісанне..." -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +msgstr "Мінае" + +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 msgid "Never" msgstr "Ніколі" -#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "Абнавіць" -#: kallithea/templates/admin/gists/edit.html:147 -#: kallithea/templates/changeset/changeset_file_comment.html:105 +#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "Адмена" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, python-format msgid "Private Gists for User %s" msgstr "Прыватны gist-запіс для карыстальніка %s" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, python-format msgid "Public Gists for User %s" msgstr "Публічны gist-запіс для карыстальніка %s" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "Публічныя gist-запісы" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "Стварыць новы gist-запіс" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "Створаны" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "Gist-запісы адсутнічаюць" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "Новы gist-запіс" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "Скінуць" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "URL" +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:31 -#: kallithea/templates/changeset/changeset_file_comment.html:95 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "Выдаліць" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "Пацвердзіце выдаленне гэтага gist-запісу" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "Рэдагаваць" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "Рэдагаваць" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "Паказаць толькі тэкст" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "створана" -#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "Паказаць толькі тэкст" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:431 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "Мой Акаўнт" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "Профіль" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 msgid "Email Addresses" msgstr "E-mail адрэсы" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "API-ключы" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 msgid "Owned Repositories" msgstr "Мае рэпазітары" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 #, fuzzy msgid "Watched Repositories" msgstr "Стварыць рэпазітары" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 msgid "Show Permissions" msgstr "Паказаць прывілеі" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "Убудаваны" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, python-format msgid "Confirm to reset this API key: %s" msgstr "Пацвердзіць скіданне гэтага API-ключа: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 msgid "Expired" msgstr "Ануляваны" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, python-format msgid "Confirm to remove this API key: %s" msgstr "Пацвердзіце выдаленне гэтага API-ключа: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 msgid "Remove" msgstr "Выдаліць" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 msgid "No additional API keys specified" msgstr "Дадатковыя API-ключы не пазначаныя" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 msgid "New API key" msgstr "Новы API-ключ" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "Дадаць" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "Асноўны" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "Пацвердзіце выдаленне e-mail: %s" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 msgid "No additional emails specified." msgstr "Дадатковыя адрасы e-mail не пазначаны." -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "Новы e-mail" @@ -3046,130 +2980,173 @@ msgid "Change Your Account Password" msgstr "Змена пароля" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "Цяперашні пароль" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "Новы пароль" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "Пацвердзіце новы пароль" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +msgid "Current IP" +msgstr "Цяперашні IP-адрас" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, fuzzy, python-format +#| msgid "Change your avatar at" +msgid "Change %s avatar at" msgstr "Змяніць аватар можна праз" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "Выкарыстоўваецца" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "Аватары адключаныя" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "Няма email адрэсы, калі ласка, абнавіце ваш email." - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "Цяперашні IP-адрас" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 msgid "Repositories You Own" msgstr "Рэпазітары, дзе Вы — уладальнік" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "Запісы не знойдзеныя." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" +msgstr "Імя" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 msgid "Repositories You are Watching" msgstr "Рэпазітары, за якімі Вы назіраеце" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "Мае апавяшчэнні" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "Усе" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "Каментары" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "Pull-запыты" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 msgid "Mark All Read" msgstr "Адзначыць усе як прачытаныя" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +#, fuzzy +#| msgid "Mark All Read" +msgid "Mark as read" +msgstr "Адзначыць усе як прачытаныя" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "Апавяшчэнняў няма" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 msgid "Show Notification" msgstr "Паказаць апавяшчэнне" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:430 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "Апавяшчэнні" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 msgid "Default Permissions" msgstr "Стандартныя прывілеі" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "Глабальныя" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "Белы спіс IP" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "Ананімны доступ" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " @@ -3178,23 +3155,30 @@ "Выбраныя прывілеі будуць усталяваныя па змоўчанні для кожнага рэпазітара." " Улічыце, што раней усталяваныя прывілеі па змоўчанні будуць скінутыя" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 +#, fuzzy msgid "Apply to all existing repositories" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +msgstr "Імпартаваць існы рэпазітар?" + +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 msgid "Permissions for the Default user on new repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 msgid "Repository group" msgstr "Група рэпазітароў" -#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " @@ -3204,20 +3188,26 @@ "рэпазітароў. Улічыце, што раней усталяваныя прывілеі па змоўчанні для " "груп рэпазітароў будуць скінутыя" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 +#, fuzzy msgid "Apply to all existing repository groups" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +msgstr "Імпартаваць існы рэпазітар?" + +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "Група карыстальнікаў" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " @@ -3227,106 +3217,136 @@ "карыстальнікаў. Улічыце, што раней усталяваныя прывілеі па змоўчанні для " "груп карыстальнікаў будуць скінутыя" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 +msgid "Permissions for the Default user on new user groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 +#, fuzzy +msgid "Top level repository creation" +msgstr "Стварэнне рэпазітара" + #: kallithea/templates/admin/permissions/permissions_globals.html:55 -msgid "Permissions for the Default user on new user groups." +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 +msgid "Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 +msgid "" +"Note: This will also give all users API access to create repositories " +"everywhere. That might change in future versions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:60 -msgid "Top level repository creation" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 msgid "User group creation" msgstr "Стварэнне груп карыстальнікаў" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "Стварэнне форка рэпазітара" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "Рэгістрацыя" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "Актывацыя іншага ўліковага запісу" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, python-format msgid "Confirm to delete this IP address: %s" msgstr "Пацвердзіце выдаленне IP %s" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 msgid "All IP addresses are allowed." msgstr "Дазволены любыя IP-адрасы." -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "Новы IP-адрас" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "Групы рэпазітароў" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "Імя групы" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "Бацькоўская група" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "" @@ -3335,31 +3355,42 @@ msgid "%s Repository Group Settings" msgstr "Налады групы рэпазітароў %s" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "Дадаць падгрупу" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "Налады" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "Дадаткова" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "Прывілеі" @@ -3383,12 +3414,14 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "Створана" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3400,16 +3433,38 @@ msgid "Delete this repository group" msgstr "Выдаліць гэту групу рэпазітароў" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "disabled" +msgid "Visible" +msgstr "адключана" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "Add Repository" +msgid "Add repos" +msgstr "Дадаць рэпазітар" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#, fuzzy +#| msgid "Add user group" +msgid "Add/Edit groups" +msgstr "Дадаць групу карыстальнікаў" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "Карыстальнік/група карыстальнікаў" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3417,34 +3472,35 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "Адклікаць" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "Дадаць новы" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#, fuzzy msgid "Apply to children" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +msgstr "дастасаваць да даччыным" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "Абедзьве" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" @@ -3452,70 +3508,83 @@ "Уключыць аўтаблакоўку для групы. Гэта опцыя будзе ўжыта да ўсіх даччыных " "груп і рэпазітарам" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "Выдаліць гэту групу" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "Пацвердзіце выдаленне гэтай групы карыстальнікаў" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" +#, fuzzy, python-format +#| msgid "Repository Group: %s" +msgid "Repository group %s" +msgstr "Група рэпазітароў: %s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "Дамоў" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "з" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 msgid "Repository Groups Administration" msgstr "Адміністраванне груп рэпазітароў" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 msgid "Number of Top-level Repositories" msgstr "Лік рэпазітароў верхняга ўзроўня" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 +#, fuzzy msgid "Clone remote repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:22 +msgstr "[створаны] рэпазітар" + +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Кароткае і асэнсаванае. Для разгорнутага апісання выкарыстоўвайце файл " "README." -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "Апцыянальна абраць групу, у якую змясціць дадзены рэпазітар." -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "Тып стваранага рэпазітара." -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "Рэвізія для выгрузкі" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3544,56 +3613,69 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, python-format msgid "%s Repository Settings" msgstr "Налады рэпазітара %s" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 msgid "Extra Fields" msgstr "Дадатковыя палі" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "Кэшы" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "Выдалены" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "Статыстыка" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 msgid "Parent" msgstr "Бацькоўская група" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "Набор" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 msgid "Manually set this repository as a fork of another from the list." msgstr "Уручную зрабіць гэты рэпазітар форкам выбранага са спісу." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 msgid "Public Journal Visibility" msgstr "Доступ да публічнага журналу" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "Выдаліць з агульнадаступнага журналу" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 msgid "Add to Public Journal" msgstr "Дадаць у публічны журнал" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." @@ -3601,36 +3683,44 @@ "Усе выконваемыя з гэтым рэпазітаром дзеянні будуць адлюстроўвацца ў " "публічным журнал." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 msgid "Change Locking" msgstr "Уключыць блакаванне" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 msgid "Confirm to unlock repository." msgstr "Пацвердзіце разблакаванне рэпазітара." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 msgid "Unlock Repository" msgstr "Разблакаваць рэпазітар" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 #, python-format msgid "Locked by %s on %s" msgstr "Заблакавана %s %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 msgid "Confirm to lock repository." msgstr "Пацвердзіце блакаванне рэпазітара." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 msgid "Lock Repository" msgstr "Заблакаваць рэпазітар" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "Рэпазітар не заблакаваны" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3638,17 +3728,21 @@ "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Пацвердзіце выдаленне гэтага рэпазітара: %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 msgid "Delete this Repository" msgstr "Выдаліць гэты рэпазітар" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" @@ -3656,15 +3750,18 @@ msgstr[1] "Дадзены рэпазітар мае %s копіі" msgstr[2] "Дадзены рэпазітар мае %s копій" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "Адлучыць форкі" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "Выдаліць форкі" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3675,101 +3772,111 @@ msgid "Invalidate Repository Cache" msgstr "Скінуць кэш рэпазітара" -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "Ручное скіданне кэша рэпазітара. Пры першым доступе кэш адновіцца." -#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 msgid "List of Cached Values" msgstr "Спіс кэшаваных значэнняў" -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "Prefix" msgstr "Прэфікс" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "Ключ" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "Актыўны" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "Пацвердзіце выдаленне гэтага поля: %s" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "Ключ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "Імя поля" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "Увядзіце кароткае імя поля" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "Апісанне поля" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "Увядзіце апісанне поля" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "Дадатковыя палі адключаныя." -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 msgid "Private Repository" msgstr "Прыватны рэпазітар" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "[forked] repository" +msgid "Fork of repository" +msgstr "[форкнуты] рэпазітар" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 msgid "Remote repository URL" msgstr "URL аддаленага рэпазітара" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" msgstr "Занесці змены з аддаленага рэпазітара" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 -msgid "Confirm to pull changes from remote repository." -msgstr "Пацвердзіце спампоўку змен з аддаленага рэпазітара." - #: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "Пацвердзіце спампоўку змен з аддаленага рэпазітара." + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" msgstr "Пастаяннае ШВ рэпазітара" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "Што гэта?" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3779,33 +3886,33 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 msgid "Remote repository" msgstr "Аддалены рэпазітар" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" msgstr "URL рэпазітара" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "Рэвізія па змоўчанні, з якой будзе рабіцца выгрузка файлаў пры спампоўцы" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "Змяніць уладальніка рэпазітара." -#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 msgid "Processed commits" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 msgid "Processed progress" msgstr "" @@ -3818,276 +3925,330 @@ msgstr "Пацвердзіце скіданне статыстыкі." #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 msgid "Repositories Administration" msgstr "Адміністраванне рэпазітароў" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "Стан" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 msgid "Settings Administration" msgstr "Адміністраванне налад" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "Хукі" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "Паўнатэкставы пошук" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "Інфармацыя пра сістэму" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "Адаслаць тэставае паведамленне на" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "Адправіць" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "Брэндынг сайта" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "Прывітанне для HTTP-аўтэнтыфікацыі" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems like Google" +" Analytics or Piwik, but also to perform " +"instance-specific customizations like adding a " +"project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 msgid "Save Settings" msgstr "Захаваць налады" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 msgid "Custom Hooks" msgstr "Карыстальніцкія хукі" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "Не атрымалася выдаліць хук" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Rescan option" +msgid "Rescan options" msgstr "Опцыі перасканіравання" -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 msgid "Delete records of missing repositories" msgstr "Сцерці запісы пра выдаленыя рэпазітары" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 msgid "" "Check this option to remove all comments, pull requests and other records" " related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "Скінуць кэш для ўсіх рэпазітароў" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "Скінуць кэш для ўсіх рэпазітароў." -#: kallithea/templates/admin/settings/settings_mapping.html:23 +#: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 msgid "Install Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 +#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " "not seem to come from Kallithea. WARNING: This operation will destroy any" " custom git hooks you may have deployed by hand!" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/templates/admin/settings/settings_mapping.html:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "Опцыі стварэння індэксу" -#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 msgid "Build from scratch" msgstr "Зборка з нуля" -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "Перабудаваць індэкс" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." +msgstr "Праверка абнаўленняў..." + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 msgid "Kallithea version" msgstr "Версія Kallithea" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 msgid "Check for updates" msgstr "Праверыць наяўнасць абнаўленняў" -#: kallithea/templates/admin/settings/settings_system.html:5 +#: kallithea/templates/admin/settings/settings_system.html:8 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 msgid "Kallithea configuration file" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" -msgstr "Платформа" - -#: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" -msgstr "Версія Git" - #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:10 -msgid "Upgrade info endpoint" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 +msgid "Platform" +msgstr "Платформа" + +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 +msgid "Git version" +msgstr "Версія Git" + +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 +msgid "Upgrade info endpoint" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "Праверка абнаўленняў..." - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "Вэб" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "Запытваць SSL для аперацый з VCS" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "Паказваць памер рэпазітара пасля адпраўкі" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "Лагаваць карыстацкія каманды адпраўкі" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "Лагаваць карыстацкія каманды атрымання" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "Абнаўляць рэпазітар пасля адпраўкі (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 msgid "Mercurial extensions" msgstr "Пашырэнні Mercurial" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 msgid "Enable largefiles extension" msgstr "Уключыць падтрымку вялікіх файлаў" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 msgid "Enable hgsubversion extension" msgstr "Уключыць падтрымку hgsubversion" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 msgid "Location of repositories" msgstr "Месцазнаходжанне рэпазітароў" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting" " take effect." @@ -4095,37 +4256,44 @@ "Націсніце для разблакавання. Змены набудуць моц пасля перазагрузкі " "Kallithea." -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "Галоўнае" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "Выкарыстоўваць дадатковыя палі ў рэпазітарах" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "Дазваляе захоўваць дадатковыя палі ў рэпазітарах." -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "Адлюстроўваць версію Kallithea" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "Паказвае або хавае нумар версіі Kallithea ў ніжняй частцы старонкі." -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "Выкарыстоўваць Gravatars у Kallithea" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4142,103 +4310,130 @@ "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +msgid "Clone URL" +msgstr "URL для кланавання" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." "\n" -" The following " +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user" +" username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "Элементы панэлі" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repository Size" +msgid "Repository page size" +msgstr "Памер рэпазітара" + +#: kallithea/templates/admin/settings/settings_visual.html:57 +#, fuzzy +#| msgid "" "Number of items displayed in the main page dashboard before +#| pagination is" " shown." msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." msgstr "" "Колькасць элементаў, што паказваюцца на галоўнай старонцы панэлі " "кіравання перад паказам нумарацыі старонак." +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 msgid "Icons" msgstr "Абразкі" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 msgid "Show public repository icon on repositories" msgstr "Паказваць абразкі публічных рэпазітароў" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 msgid "Show private repository icon on repositories" msgstr "Паказваць абразкі прыватных рэпазітароў" -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 msgid "Show public/private icons next to repository names." msgstr "Паказваць абразкі публічных рэпазітароў." -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 msgid "Meta Tagging" msgstr "Метатэгаванне" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "Дадаць групу карыстальнікаў" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "Групы карыстальнікаў" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "Дадаць групу карыстальнікаў" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "Кароткае дадатковае апісанне для гэтай групы карыстальнікаў." #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 msgid "Show Members" msgstr "Паказаць удзельнікаў" @@ -4248,13 +4443,15 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "Удзельнікі" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "Пацвердзіце выдаленне наступнай групы карыстальнікаў: %s" @@ -4263,48 +4460,59 @@ msgid "Delete this user group" msgstr "Выдаліць гэтую групу карыстальнікаў" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "Няма ўдзельнікаў" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "Абраныя ўдзельнікі групы" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "Даступныя ўдзельнікі" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 msgid "User Groups Administration" msgstr "Адміністраванне груп карыстальнікаў" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "Дадаць карыстальніка" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "Карыстальнікі" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "Дадаць карыстальніка" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "Пацверджанне пароля" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "" @@ -4314,12 +4522,14 @@ msgstr "Карыстальнік: %s" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "Апошні ўваход" @@ -4328,7 +4538,8 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "Пацвердзіце выдаленне карыстальніка %s" @@ -4337,401 +4548,456 @@ msgid "Delete this user" msgstr "Выдаліць гэтага карыстальніка" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "Не паказаны email. Калі ласка, абнавіце email карыстальніка." - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "Пацвердзіце новы пароль" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 msgid "Users Administration" msgstr "Адміністраванне карыстальнікаў" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "Асобнік сервера: %s" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "Падтрымка" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "Рэпазітар Mercurial" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "Git рэпазітар" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 msgid "Create Fork" msgstr "Стварыць форк" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "Агульныя звесткі" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "Гісторыя змен" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "Файлы" -#: kallithea/templates/base/base.html:142 -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 msgid "Options" msgstr "Опцыі" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:147 +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 msgid "Compare Fork" msgstr "Параўнаць форк" -#: kallithea/templates/base/base.html:154 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 msgid "Compare" msgstr "Параўнаць" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:331 +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 msgid "Search" msgstr "Пошук" -#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:155 +#: kallithea/tests/data/templates/base/base.html.py:399 msgid "Unlock" msgstr "Разблакаваць" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:157 +#: kallithea/tests/data/templates/base/base.html.py:405 msgid "Lock" msgstr "Заблакаваць" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:165 +#: kallithea/tests/data/templates/base/base.html.py:413 msgid "Follow" msgstr "Назіраць" -#: kallithea/templates/base/base.html:171 +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 msgid "Unfollow" msgstr "Не назіраць" -#: kallithea/templates/base/base.html:174 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 msgid "Fork" msgstr "Форк" -#: kallithea/templates/base/base.html:175 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/base/base.html:170 +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 msgid "Create Pull Request" msgstr "Стварыць pull-запыт" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "Паказаць pull-запыты для %s" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 msgid "Switch To" msgstr "Пераключыцца на" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:485 +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 msgid "No matches found" msgstr "Супадзенняў не знойдзена" -#: kallithea/templates/base/base.html:305 +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "Паказаць апошнюю актыўнасць" -#: kallithea/templates/base/base.html:311 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 msgid "Public journal" msgstr "Агульнадаступны журнал" -#: kallithea/templates/base/base.html:317 +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 msgid "Show public gists" msgstr "Паказаць публічныя запісы" -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 msgid "Gists" msgstr "Gist" -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:311 +#: kallithea/tests/data/templates/base/base.html.py:525 msgid "All Public Gists" msgstr "Усе публічныя Gist-запісы" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 msgid "My Public Gists" msgstr "Мае публічныя Gist-запісы" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 msgid "My Private Gists" msgstr "Мае прыватныя Gist-запісы" -#: kallithea/templates/base/base.html:330 +#: kallithea/templates/base/base.html:319 +#: kallithea/tests/data/templates/base/base.html.py:540 msgid "Search in repositories" msgstr "Пошук па рэпазітарах" -#: kallithea/templates/base/base.html:353 -#: kallithea/templates/base/base.html:354 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 msgid "My Pull Requests" msgstr "Мае pull-запыты" -#: kallithea/templates/base/base.html:377 +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 msgid "Not Logged In" msgstr "Не аўтарызаваны" -#: kallithea/templates/base/base.html:384 +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 msgid "Login to Your Account" msgstr "Аўтарызавацца" +#: kallithea/templates/base/base.html:385 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" +msgstr "Забыліся на пароль?" + +#: kallithea/templates/base/base.html:389 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "Няма акаўнта?" + #: kallithea/templates/base/base.html:407 -msgid "Forgot password ?" -msgstr "Забыліся на пароль?" - -#: kallithea/templates/base/base.html:434 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "Выйсці" -#: kallithea/templates/base/base.html:615 -msgid "Keyboard shortcuts" -msgstr "Гарачыя клавішы" - -#: kallithea/templates/base/base.html:624 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 msgid "Inherit defaults" msgstr "Ужываць значэнні па змоўчанні" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "Стварыць рэпазітары" +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 +msgid "Select this option to allow repository creation for this user" +msgstr "Опцыя дазваляе карыстальніку ствараць рэпазітары" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "Опцыя дазваляе карыстальніку ствараць рэпазітары" - -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "Ствараць групы карыстальнікаў" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "Опцыя дазваляе карыстальніку ствараць групы карыстальнікаў" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "Ствараць fork ад рэпазітароў" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "" "Абярыце гэту опцыю каб дазволіць дадзенаму карыстальніку ствараць форкі " "рэпазітароў" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "Паказаць" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "Прывілеі яшчэ не прызначаныя" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "Прывілей" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "Змяніць прывілеі" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 +#: kallithea/templates/base/root.html:25 +#: kallithea/tests/data/templates/base/root.html.py:85 msgid "Add Another Comment" msgstr "Дадаць яшчэ адзін каментар" -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 +#: kallithea/templates/base/root.html:26 +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 msgid "Stop following this repository" msgstr "Адмяніць назіранне за рэпазітаром" -#: kallithea/templates/base/root.html:24 +#: kallithea/templates/base/root.html:27 +#: kallithea/tests/data/templates/base/root.html.py:89 msgid "Start following this repository" msgstr "Назіраць за рэпазітаром" -#: kallithea/templates/base/root.html:25 +#: kallithea/templates/base/root.html:28 +#: kallithea/tests/data/templates/base/root.html.py:91 msgid "Group" msgstr "Група" -#: kallithea/templates/base/root.html:26 +#: kallithea/templates/base/root.html:29 +#: kallithea/tests/data/templates/base/root.html.py:93 msgid "members" msgstr "удзельнікі" -#: kallithea/templates/base/root.html:27 +#: kallithea/templates/base/root.html:30 +#: kallithea/tests/data/templates/base/root.html.py:95 msgid "Loading ..." msgstr "Загрузка..." -#: kallithea/templates/base/root.html:28 +#: kallithea/templates/base/root.html:31 +#: kallithea/tests/data/templates/base/root.html.py:97 msgid "loading ..." msgstr "загрузка..." -#: kallithea/templates/base/root.html:29 +#: kallithea/templates/base/root.html:32 +#: kallithea/tests/data/templates/base/root.html.py:99 msgid "Search truncated" msgstr "Пошук усечаны" -#: kallithea/templates/base/root.html:30 +#: kallithea/templates/base/root.html:33 +#: kallithea/tests/data/templates/base/root.html.py:101 msgid "No matching files" msgstr "Няма супадзенняў" -#: kallithea/templates/base/root.html:31 +#: kallithea/templates/base/root.html:34 +#: kallithea/tests/data/templates/base/root.html.py:103 msgid "Open New Pull Request from {0}" msgstr "Стварыць новы pull-запыт з {0}" -#: kallithea/templates/base/root.html:32 +#: kallithea/templates/base/root.html:35 +#: kallithea/tests/data/templates/base/root.html.py:105 msgid "Open New Pull Request for {0} → {1}" msgstr "Стварыць новы pull-запыт для {0} → {1}" -#: kallithea/templates/base/root.html:33 +#: kallithea/templates/base/root.html:36 +#: kallithea/tests/data/templates/base/root.html.py:107 msgid "Show Selected Changesets {0} → {1}" msgstr "Паказаць выбраныя наборы змен: {0} → {1}" -#: kallithea/templates/base/root.html:34 +#: kallithea/templates/base/root.html:37 +#: kallithea/tests/data/templates/base/root.html.py:109 msgid "Selection Link" msgstr "Спасылка выбару" -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/base/root.html:38 +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 msgid "Collapse Diff" msgstr "Згарнуць параўнанне" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:39 +#: kallithea/tests/data/templates/base/root.html.py:113 msgid "Expand Diff" msgstr "Разгарнуць параўнанне" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:40 +#: kallithea/tests/data/templates/base/root.html.py:115 msgid "Failed to revoke permission" msgstr "Не атрымалася адклікаць прывілеі" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "Пацвердзіце выдаленне прывілею для {0}: {1} ?" -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "уключана" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "адключана" - -#: kallithea/templates/base/root.html:42 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "Выбраць набор змен" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 msgid "Specify changeset" msgstr "Выбраць набор змен" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "Закладкі %s" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "Параўнаць закладкі" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "Аўтар" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "Рэвізія" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "%s Галіны" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "Параўнаць галіны" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "Па ўзрастанні" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "Па змяншэнні" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "Запісы не знойдзеныя." + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "Памылка дадзеных." + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." +msgstr "Загрузка..." #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "Логі змен %s" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" @@ -4739,32 +5005,41 @@ msgstr[1] "Паказаны %d з %d рэвізій" msgstr[2] "Паказаны %d з %d рэвізій" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "Ачысціць выбар" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 msgid "Go to tip of repository" msgstr "Перайсці на верхавіну рэпазітара" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "Параўнаць fork з %s" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "Параўнаць форк з бацькоўскім рэпазітаром (%s)" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 msgid "Branch filter:" msgstr "Адфільтраваць галіну:" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 #, python-format msgid "" "Changeset status: %s by %s\n" @@ -4773,171 +5048,244 @@ "Статус набору змен: %s ад %s\n" "Клікніце, каб адкрыць адпаведны pull-запыт %s" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/changelog/changelog_summary_data.html:24 +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 #, python-format msgid "Changeset status: %s by %s" msgstr "Статус набору змен: %s ад %s" -#: kallithea/templates/changelog/changelog.html:116 -#: kallithea/templates/compare/compare_cs.html:63 +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 msgid "Expand commit message" msgstr "Разгарнуць паведамленне" -#: kallithea/templates/changelog/changelog.html:125 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/changelog/changelog.html:116 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "Каментары адсутнічаюць" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:57 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "Закладка %s" -#: kallithea/templates/changelog/changelog.html:141 -#: kallithea/templates/changelog/changelog_summary_data.html:63 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#: kallithea/templates/compare/compare_cs.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:203 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "Тэг %s" -#: kallithea/templates/changelog/changelog.html:146 -#: kallithea/templates/changelog/changelog_summary_data.html:68 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "Галіна %s" -#: kallithea/templates/changelog/changelog.html:311 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "Змен яшчэ няма" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "Выдалена" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "Зменена" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:47 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "Дададзена" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "Закранае %s файлаў" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "Рэвізія" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "Узрост" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "Аўтар" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "Спасылкі" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "Дадаць ці загрузіць файлы праз Kallithea" -#: kallithea/templates/changelog/changelog_summary_data.html:87 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "Дадаць новы файл" -#: kallithea/templates/changelog/changelog_summary_data.html:93 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 msgid "Push new repository" msgstr "Адправіць новы рэпазітар" -#: kallithea/templates/changelog/changelog_summary_data.html:101 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "Існы рэпазітар?" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "%s Змены" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:39 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "Статус змен" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "Адлюстраваць у фармаце diff" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "Patch diff" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:75 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "Спампаваць diff" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 +#, fuzzy msgid "Merge" -msgstr "" +msgstr "звесці" + +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 +msgid "Grafted from:" +msgstr "Перанесена з:" #: kallithea/templates/changeset/changeset.html:123 -msgid "Grafted from:" -msgstr "Перанесена з:" +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 +msgid "Transplanted from:" +msgstr "" #: kallithea/templates/changeset/changeset.html:129 -msgid "Transplanted from:" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 msgid "Replaced by:" msgstr "Заменена:" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 msgid "Preceded by:" msgstr "Замяняе:" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:329 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4945,9 +5293,12 @@ msgstr[1] "%s файлы зменена" msgstr[2] "%s файлаў зменена" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:62 -#: kallithea/templates/pullrequests/pullrequest_show.html:331 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4955,43 +5306,57 @@ msgstr[1] "%s файлы зменена: %s даданні, %s выдаленні" msgstr[2] "%s файлаў зменена: %s даданняў, %s выдаленняў" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 msgid "Show full diff anyway" msgstr "Паказаць поўны diff" -#: kallithea/templates/changeset/changeset.html:231 -#: kallithea/templates/changeset/changeset.html:268 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 msgid "No revisions" msgstr "Няма рэвізій" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 msgid "on pull request" msgstr "у pull-запыце" -#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 msgid "No title" msgstr "Няма загалоўка" -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 msgid "on this changeset" msgstr "на змене" -#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 msgid "Delete comment?" msgstr "Выдаліць каментар?" -#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 msgid "Status change" msgstr "Змена статусу" -#: kallithea/templates/changeset/changeset_file_comment.html:59 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 msgid "Commenting on line." msgstr "Каментар да радка." -#: kallithea/templates/changeset/changeset_file_comment.html:60 +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 #, fuzzy msgid "" "Comments are in plain text. Use @username inside this text to notify " @@ -5000,47 +5365,59 @@ "Выкарыстоўвайце @імя_карыстальніка ў тэксце, каб адправіць паведамленне " "пэўнаму карыстальніку" -#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 msgid "Set changeset status" msgstr "Змяніць статус рэвізіі" -#: kallithea/templates/changeset/changeset_file_comment.html:69 +#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:75 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 msgid "No change" msgstr "Без змен" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 msgid "Finish pull request" msgstr "Завяршыць pull-запыт" -#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 msgid "Close" msgstr "Закрыць" -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 msgid "Submitting ..." msgstr "Адпраўка..." -#: kallithea/templates/changeset/changeset_file_comment.html:104 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "Каментаваць" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "Вам неабходна аўтарызавацца, каб пакідаць каментары." -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "Аўтарызавацца зараз" -#: kallithea/templates/changeset/changeset_file_comment.html:116 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "Схаваць" -#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -5048,7 +5425,8 @@ msgstr[1] "%d каментары" msgstr[2] "%d каментароў" -#: kallithea/templates/changeset/changeset_file_comment.html:129 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, python-format msgid "%d inline" msgid_plural "%d inline" @@ -5056,7 +5434,8 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:130 +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 #, python-format msgid "%d general" msgid_plural "%d general" @@ -5065,108 +5444,170 @@ msgstr[2] "" #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "%s Змены" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "Статус набору змен: %s" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "Закранутыя файлы" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "файл выдалены" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "Без змен" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 msgid "Deleted" msgstr "Выдалены" -#: kallithea/templates/changeset/diff_block.html:57 +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 msgid "Renamed" msgstr "Пераназваны" -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Невядомая рэвізія %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Безназоўны" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "файл выдалены" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "Паказаць поўны diff для гэтага файла" -#: kallithea/templates/changeset/diff_block.html:69 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "Паказаць поўны diff для гэтага файла" -#: kallithea/templates/changeset/diff_block.html:83 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "Паказаць каментары ў радках" #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "Няма змен" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "Продак" - -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "Статус набору змен: %s" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +#, fuzzy +#| msgid "Common ancestor" +msgid "Merge Ancestor" +msgstr "Агульны продак" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:85 +#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 msgid "Show merge diff" msgstr "Паказаць merge diff" -#: kallithea/templates/compare/compare_cs.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:321 -msgid "Common ancestor" -msgstr "Агульны продак" - -#: kallithea/templates/compare/compare_cs.html:99 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:107 +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 msgid "is" msgstr "адстае на" -#: kallithea/templates/compare/compare_cs.html:108 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, python-format msgid "%s changesets" msgstr "%s змен" -#: kallithea/templates/compare/compare_cs.html:109 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 msgid "behind" msgstr "ад" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "%s Параўнаць" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "Параўнаць рэвізіі" #: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "" #: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5174,114 +5615,189 @@ msgstr[1] "Паказаць %s commit'ы" msgstr[2] "Паказаць %s commit'аў" -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "Паказаць поўны diff" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "Публічны рэпазітар" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "Змен яшчэ не было" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "Падпісацца на стужку RSS %s" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "Падпісацца на стужку Atom %s" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "Ствараецца" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "%(user)s пакінуў каментар да набору змен %(age)s" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "Comment from %s on %s changeset %s" +msgid "Comment on Changeset \"%s\"" msgstr "Каментар ад %s да набору змен %s %s" -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "Статус набору змен зменены на" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "Гэта аўтаматычнае апавяшчэнне. Не адказвайце на гэтае паведамленне." - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset flow" +msgid "Changeset on" +msgstr "Струмень змен" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Галіна" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Змена статусу" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "This pull request has been closed and can not be updated." +msgid "The pull request has been closed." +msgstr "Гэты pull-запыт быў зачынены і не можа быць абноўлены." + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "Добры дзень, %s" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 msgid "We have received a request to reset the password for your account." msgstr "Мы атрымалі запыт на скіданне пароля для вашага акаўнта." -#: kallithea/templates/email_templates/password_reset.html:8 +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 msgid "" "This account is however managed outside this system and the password " "cannot be changed here." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:13 +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, fuzzy, python-format +#| msgid "%s mentioned you on %s pull request \"%s\"" +msgid "Mention on Pull Request %s \"%s\" by %s" msgstr "%s згадаў Вас у каментары да pull-запыту %s \"%s\"" -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, fuzzy, python-format +#| msgid "%s requested your review of %s pull request \"%s\"" +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" msgstr "%s запытаў рэцэнзаванне pull-запыту %s \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "on pull request" +msgid "Pull request from" +msgstr "у pull-запыце" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +#, fuzzy +#| msgid "Date" +msgid "at" +msgstr "Дата" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" +msgstr "" + #: kallithea/templates/email_templates/pull_request_comment.html:4 -#, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "Каментар зачыніў pull-запыт са статусам" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "Каментар пакінуты са статусам" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "Падрабязней пра карыстальніка" +#, fuzzy, python-format +#| msgid "%s mentioned you on %s pull request \"%s\"" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "%s згадаў Вас у каментары да pull-запыту %s \"%s\"" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s from %s#%s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "Pull-запыт %s ад %s#%s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "[каментар] у pull-запыце для" + +#: kallithea/templates/email_templates/registration.html:22 +#, fuzzy +#| msgid "Group name" +msgid "Full Name" +msgstr "Імя групы" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5299,82 +5815,104 @@ msgstr "Параўнанне файла %s" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "%s Файлы" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "%s Файлаў дададзена" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "Размяшчэнне" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "Увядзіце імя файла..." -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "ці" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "Адаслаць файл" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "Стварыць новы файл" #: kallithea/templates/files/files_add.html:53 +#: kallithea/tests/data/templates/files/files_add.html.py:241 msgid "New file type" msgstr "Тып новага файла" -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 msgid "Commit Changes" msgstr "Захаваць змены" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "Папярэдняя рэвізія" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "Наступная рэвізія" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "Адсочваць дадзеную галіну" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "Загружаецца спіс файлаў..." -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 msgid "Size" msgstr "Памер" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 msgid "Last Revision" msgstr "Апошняя версія" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 msgid "Last Modified" msgstr "Апошняя змена" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 msgid "Last Committer" msgstr "Аўтар апошняй рэвізіі" @@ -5384,7 +5922,7 @@ msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "Выдаліць файл" @@ -5397,25 +5935,24 @@ msgid "Edit file" msgstr "Рэдагаваць файл" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "Зыходны код" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "Рэдагаванне файла" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" @@ -5423,84 +5960,105 @@ msgstr[1] "%s аўтараў" msgstr[2] "%s аўтара" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 +msgid "Show Full History" +msgstr "Паказаць ўсю гісторыю" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "Паказаць ўсю гісторыю" - -#: kallithea/templates/files/files_source.html:11 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "Паказаць аўтараў" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" +#: kallithea/templates/files/files_source.html:34 +#, fuzzy, python-format +#| msgid "Deleted branch: %s" +msgid "Edit on Branch: %s" +msgstr "Выдаленая галіна: %s" + +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +msgid "Editing binary files not allowed" +msgstr "Рэдагаванне бінарных файлаў забароненае" + +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +msgid "Editing files allowed only when on branch head revision" +msgstr "Рэдагаванне файлаў дазволенае толькі ў HEAD-рэвізіі дадзенай галіны" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "Рэдагаванне бінарных файлаў забароненае" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "Рэдагаванне файлаў дазволенае толькі ў HEAD-рэвізіі дадзенай галіны" - -#: kallithea/templates/files/files_source.html:45 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "Бінарны файл (%s)" -#: kallithea/templates/files/files_source.html:74 +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 msgid "File is too big to display." msgstr "Файл занадта вялікі для адлюстравання." -#: kallithea/templates/files/files_source.html:76 +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 msgid "Show full annotation anyway." msgstr "Паказаць поўныя анатацыі." -#: kallithea/templates/files/files_source.html:78 +#: kallithea/templates/files/files_source.html:73 +#: kallithea/tests/data/templates/files/files_source.html.py:133 msgid "Show as raw." msgstr "Паказаць сырым." #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "анатацыя" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "Вярнуцца" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "Па зададзеным шляху файлы адсутнічаюць" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "%s Назіральнікі" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "Назіральнікі" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "Назіраць за рэпазітаром" @@ -5509,72 +6067,82 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "Імя форка" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" "Рэвізія па змаўчанні, з якой будзе вырабляцца выгрузка файлаў пры " "спампоўцы." -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "Прыватны" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "Скапіяваць прывілеі" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "Скапіяваць прывілеі з форкнутага рэпазітара" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "Абнаўляць пасля кланавання" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "Спампоўваць зыходнікі пасля стварэння клона" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "Форкі %s" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "Адгалінаванні" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "Форкнута" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "Форкі яшчэ не створаныя" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 msgid "ATOM journal feed" msgstr "Стужка часопіса Atom" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "Стужка часопіса RSS" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "Мае рэпазітары" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "Запісы адсутнічаюць" @@ -5588,34 +6156,45 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 msgid "New Pull Request" msgstr "Новы pull-запыт" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "Загаловак" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "Напісаць кароткае пісанне па гэтым запыце" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "Струмень змен" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "Першапачатковы рэпазітар" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "Рэпазітар прызначэння" @@ -5650,7 +6229,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "Зачынена" @@ -5668,33 +6249,41 @@ msgstr "Пацвердзіце выдаленне гэтага pull-запыту з %s каментарамі" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, python-format msgid "%s Pull Request %s" msgstr "%s зull-запыт %s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, python-format msgid "Pull request %s from %s#%s" msgstr "Pull-запыт %s ад %s#%s" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "Яшчэ не разгледжаны" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" @@ -5702,85 +6291,112 @@ msgstr[1] "%d рэцэнзенты" msgstr[2] "%d рэцэнзентаў" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "Запыт на занясенне змен быў разгледжаны ўсімі рэцэнзентамі" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 msgid "There are no reviewers" msgstr "Няма рэцэнзентаў" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 msgid "on" msgstr "на" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "Цэль" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "Прыняць змены" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "Абнавіць" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 +#, fuzzy +#| msgid "Registration" +msgid "Next iteration" +msgstr "Рэгістрацыя" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:215 +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 msgid "" -"Pull requests do not change once created. Select a revision and save to " -"replace this pull request with a new one." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:224 +"Pull request iterations do not change content once created. Select a " +"revision and save to make a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +msgid "Save Changes" +msgstr "Захаваць змены" + +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +msgid "Cancel Changes" +msgstr "Адмяніць змены" + +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 msgid "Pull Request Reviewers" msgstr "Рэцэнзенты pull-запытаў" -#: kallithea/templates/pullrequests/pullrequest_show.html:249 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 msgid "Remove reviewer" msgstr "Выдаліць рэцэнзента" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:269 +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 msgid "Potential Reviewers" msgstr "Патэнцыйныя рэцэнзенты" -#: kallithea/templates/pullrequests/pullrequest_show.html:272 +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:295 -msgid "Save Changes" -msgstr "Захаваць змены" +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 +msgid "Pull Request Content" +msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:296 -msgid "Save Updates as New Pull Request" -msgstr "Захаваць абнаўленні як новы pull-запыт" - -#: kallithea/templates/pullrequests/pullrequest_show.html:297 -msgid "Cancel Changes" -msgstr "Адмяніць змены" - -#: kallithea/templates/pullrequests/pullrequest_show.html:307 -msgid "Pull Request Content" -msgstr "" +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +msgid "Common ancestor" +msgstr "Агульны продак" #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format @@ -5797,240 +6413,468 @@ msgid "Pull Requests to '%s'" msgstr "Pull-запыты да '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "Стварыць новы pull-запыт" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "Паказаць pull-запыты да %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "Паказаць pull-запыты ад %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +#, fuzzy +#| msgid "Pull Request Reviewers" +msgid "Pull Requests Needing My Review" +msgstr "Рэцэнзенты pull-запытаў" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 msgid "Search in All Repositories" msgstr "Пошук па ўсіх рэпазітарах" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "Фраза для пошуку" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "Крытэр пошуку" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "Змест файлаў" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "Паведамленні камітаў" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "Імя файла" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "Недастаткова правоў" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "Atom стужка рэпазітара %s" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "RSS стужка рэпазітара %s" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "Уключана" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "Атрыманая статыстыка: " -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "файлы" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "Паказаць яшчэ" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 msgid "commits" msgstr "commit'ы" +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "файлы дададзены" + +#: kallithea/templates/summary/statistics.html:390 +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" +msgstr "файлы зменены" + #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "файлы дададзены" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" -msgstr "файлы зменены" +#: kallithea/tests/data/templates/summary/statistics.html.py:153 +msgid "files removed" +msgstr "файлы выдалены" #: kallithea/templates/summary/statistics.html:393 -msgid "files removed" -msgstr "файлы выдалены" +#: kallithea/tests/data/templates/summary/statistics.html.py:155 +msgid "commit" +msgstr "commit" + +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 +msgid "file added" +msgstr "файл выдалены" #: kallithea/templates/summary/statistics.html:395 -msgid "commit" -msgstr "commit" +#: kallithea/tests/data/templates/summary/statistics.html.py:159 +msgid "file changed" +msgstr "файл зменены" #: kallithea/templates/summary/statistics.html:396 -msgid "file added" -msgstr "файл выдалены" - -#: kallithea/templates/summary/statistics.html:397 -msgid "file changed" -msgstr "файл зменены" - -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "файл выдалены" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "%s агульныя звесткі" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "Рэпазітар заблакаваны %s" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "Рэпазітар разблакаваны" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "Форк ад" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "Кланаваць з" +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 +msgid "Show by ID" +msgstr "Паводле ID" + #: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "URL для кланавання" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/summary/summary.html.py:143 msgid "Show by Name" msgstr "Паводле імя" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "Паводле ID" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "Папулярныя файлы" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 msgid "Download" msgstr "Спампаваць" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 msgid "There are no downloads yet" msgstr "Спамповак яшчэ няма" +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 +msgid "Downloads are disabled for this repository" +msgstr "Спампоўванне адключанае ў гэтым рэпазітары" + +#: kallithea/templates/summary/summary.html:108 +#: kallithea/tests/data/templates/summary/summary.html.py:190 +msgid "Download as zip" +msgstr "Спампаваць у zip" + +#: kallithea/templates/summary/summary.html:112 +#: kallithea/tests/data/templates/summary/summary.html.py:194 +msgid "Check this to download archive with subrepos" +msgstr "Адзначце для спампоўкі архіва з даччынымі рэпазітарамі" + #: kallithea/templates/summary/summary.html:114 -msgid "Downloads are disabled for this repository" -msgstr "Спампоўванне адключанае ў гэтым рэпазітары" - -#: kallithea/templates/summary/summary.html:120 -msgid "Download as zip" -msgstr "Спампаваць у zip" - -#: kallithea/templates/summary/summary.html:125 -msgid "Check this to download archive with subrepos" -msgstr "Адзначце для спампоўкі архіва з даччынымі рэпазітарамі" - -#: kallithea/templates/summary/summary.html:125 +#: kallithea/tests/data/templates/summary/summary.html.py:196 msgid "With subrepos" msgstr "З даччынымі рэпазітарамі" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "Памер рэпазітара" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "Стужка навін" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 msgid "Latest Changes" msgstr "Апошнія змены" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 msgid "Quick Start" msgstr "Хуткі старт" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "Спампаваць %s як %s" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "%s Тэгаў" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "Параўнаць тэгі" +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "Панэль кіравання" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "Імя групы" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "Запомніць" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "Змяніць аватар можна праз" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "Выкарыстоўваецца" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "Няма email адрэсы, калі ласка, абнавіце ваш email." + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "Опцыі перасканіравання" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "Вэб" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "Запытваць SSL для аперацый з VCS" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "" +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "Выкарыстоўваць Gravatars у Kallithea" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." +"\n" +" The following " +"variables are available:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "Элементы панэлі" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "" +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" +"Колькасць элементаў, што паказваюцца на галоўнай старонцы панэлі " +"кіравання перад паказам нумарацыі старонак." + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "фільтр..." + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "Не паказаны email. Калі ласка, абнавіце email карыстальніка." + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "Гарачыя клавішы" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "Забыліся на пароль?" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "Продак" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "Каментар ад %s да набору змен %s %s" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "Статус набору змен зменены на" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "Гэта аўтаматычнае апавяшчэнне. Не адказвайце на гэтае паведамленне." + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "%s згадаў Вас у каментары да pull-запыту %s \"%s\"" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "%s запытаў рэцэнзаванне pull-запыту %s \"%s\"" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +msgid "The comment closed the pull request with status" +msgstr "Каментар зачыніў pull-запыт са статусам" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +msgid "The comment was made with status" +msgstr "Каментар пакінуты са статусам" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "Падрабязней пра карыстальніка" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" +msgstr "Памер рэпазітара" #~ msgid "No comments." #~ msgstr "Няма каментароў." @@ -6074,12 +6918,6 @@ #~ msgid "invalid clone URL" #~ msgstr "няслушны URL для кланавання" -#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" -#~ msgstr "" - -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" -#~ msgstr "Рэвізіі %(revs)s ужо ўключаны ў pull-request ці маюць усталяваны статус" - #~ msgid "Defaults" #~ msgstr "Значэнні па змаўчанні" @@ -6095,15 +6933,6 @@ #~ msgid "reset" #~ msgstr "cкінуць" -#~ msgid "expired" -#~ msgstr "" - -#~ msgid "No additional api keys specified" -#~ msgstr "" - -#~ msgid "New api key" -#~ msgstr "" - #~ msgid "delete" #~ msgstr "выдаліць" @@ -6134,12 +6963,6 @@ #~ msgid "admin" #~ msgstr "адміністратар" -#~ msgid "user/user group" -#~ msgstr "" - -#~ msgid "delegated admin" -#~ msgstr "" - #~ msgid "Optional URL from which repository should be cloned." #~ msgstr "Апцыянальны URL, з якога патрабуецца скланаваць рэпазітар." @@ -6149,9 +6972,6 @@ #~ msgid "Pull Changes from Remote Location" #~ msgstr "Атрымаць змены з выдаленага боку" -#~ msgid "This repository does not have a remote URL set." -#~ msgstr "" - #~ msgid "Non-changeable id" #~ msgstr "Нязменлівы id" @@ -6161,69 +6981,21 @@ #~ msgid "new value" #~ msgstr "новае значэнне" -#~ msgid "URL used for doing remote pulls." -#~ msgstr "" - -#~ msgid "Email prefix" -#~ msgstr "" - -#~ msgid "Kallithea email from" -#~ msgstr "" - -#~ msgid "Error email from" -#~ msgstr "" - -#~ msgid "Error email recipients" -#~ msgstr "" - #~ msgid "SMTP server" #~ msgstr "SMTP-сервер" -#~ msgid "SMTP username" -#~ msgstr "" - -#~ msgid "SMTP password" -#~ msgstr "" - -#~ msgid "SMTP port" -#~ msgstr "" - -#~ msgid "SMTP use TLS" -#~ msgstr "" - -#~ msgid "SMTP use SSL" -#~ msgstr "" - -#~ msgid "SMTP auth" -#~ msgstr "" - #~ msgid "Destroy old data" #~ msgstr "Знішчыць усе дадзеныя" #~ msgid "Default permissions" #~ msgstr "Стандартныя прывілеі" -#~ msgid "Inherit from defaults" -#~ msgstr "" - #~ msgid "show" #~ msgstr "паказа́ць" -#~ msgid "parent rev." -#~ msgstr "" - -#~ msgid "child rev." -#~ msgstr "" - #~ msgid "Status change from pull request" #~ msgstr "Змена статусу" -#~ msgid "Status change on changeset" -#~ msgstr "" - -#~ msgid "Comment on changeset" -#~ msgstr "" - #~ msgid "revision" #~ msgstr "рэвізія" @@ -6260,23 +7032,241 @@ #~ msgid "You can generate it by clicking following URL" #~ msgstr "Вы можаце нанова згенераваць яго, пяройдучы па наступнай спасылцы" -#~ msgid "Please ignore this email if you did not request a new password ." -#~ msgstr "" - #~ msgid "Created by" #~ msgstr "Створана" +#~ msgid "Ancestor didn't change - show diff since previous version:" +#~ msgstr "" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "Зачынены, заменены %s." + +#~ msgid "Closing." +#~ msgstr "Зачынены." + +#~ msgid "Changeset not found" +#~ msgstr "Набор змен не знойдзены" + +#~ msgid "Repository no access" +#~ msgstr "Рэпазітар - няма доступу" + +#~ msgid "Repository read access" +#~ msgstr "Рэпазітар - доступ на чытанне" + +#~ msgid "Repository write access" +#~ msgstr "Рэпазітар - доступ на запіс" + +#~ msgid "Repository admin access" +#~ msgstr "Рэпазітар - адміністраванне" + +#~ msgid "Repository Group no access" +#~ msgstr "Група Рэпазітароў - няма доступу" + +#~ msgid "Repository Group read access" +#~ msgstr "Група Рэпазітароў - доступ на чытанне" + +#~ msgid "Repository Group write access" +#~ msgstr "Група Рэпазітароў - доступ на запіс" + +#~ msgid "Repository Group admin access" +#~ msgstr "Група Рэпазітароў - адміністраванне" + +#~ msgid "Repository creation disabled" +#~ msgstr "Стварэнне рэпазітароў адключанае" + +#~ msgid "Repository creation enabled" +#~ msgstr "Стварэнне рэпазітароў уключанае" + +#~ msgid "Repository forking disabled" +#~ msgstr "Магчымасць ствараць форк рэпазітара адключаная" + +#~ msgid "Repository forking enabled" +#~ msgstr "Магчымасць ствараць форк рэпазітара ўключаная" + +#~ msgid "Register disabled" +#~ msgstr "Рэгістрацыя адключаная" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "Рэгістрацыя новага карыстальніка ў Kallithea з ручной актывацыяй" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "Рэгістрацыя новага карыстальніка ў Kallithea з аўтаматычнай актывацыяй" + +#~ msgid "Not Reviewed" +#~ msgstr "Не прагледжана" + +#~ msgid "Rejected" +#~ msgstr "Адхілена" + +#~ msgid "Under Review" +#~ msgstr "На разглядзе" + +#~ msgid "Repository group no access" +#~ msgstr "Група Рэпазітароў - няма доступу" + +#~ msgid "Repository group read access" +#~ msgstr "Група рэпазітароў - доступ на чытанне" + +#~ msgid "Repository group write access" +#~ msgstr "Група рэпазітароў - доступ на запіс" + +#~ msgid "Repository group admin access" +#~ msgstr "Група рэпазітароў - адміністраванне" + +#~ msgid "User group no access" +#~ msgstr "Група карыстальнікаў - няма доступу" + +#~ msgid "User group read access" +#~ msgstr "Група карыстальнікаў - доступ на чытанне" + +#~ msgid "User group write access" +#~ msgstr "Група карыстальнікаў - доступ на запіс" + +#~ msgid "User group admin access" +#~ msgstr "Група карыстальнікаў - адміністраванне" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "Стварэнне груп рэпазітароў адключанае" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "Стварэнне груп рэпазітароў уключанае" + +#~ msgid "User Group creation disabled" +#~ msgstr "Стварэнне груп карыстальнікаў адключанае" + +#~ msgid "User Group creation enabled" +#~ msgstr "Стварэнне груп карыстальнікаў уключанае" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "Рэгістрацыя карыстальніка з ручной актывацыяй уліковага запісу" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "Рэгістрацыя карыстальніка з аўтаматычнай актывацыяй" + +#~ msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" +#~ "%(user)s просіць вас разгледзець pull " +#~ "request %(pr_nice_id)s: %(pr_title)s" + +#~ msgid "repositories" +#~ msgstr "рэпазітары" + +#~ msgid "No repositories found." +#~ msgstr "Рэпазітары не знойдзеныя." + +#~ msgid "There are no branches yet" +#~ msgstr "Галіны яшчэ не створаныя" + +#~ msgid "There are no tags yet" +#~ msgstr "Пазнакі адсутнічаюць" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "Закладак яшчэ няма" + +#~ msgid "Analytics HTML block" +#~ msgstr "" + +#~ msgid "" +#~ "HTML with JavaScript for web analytics" +#~ " systems like Google Analytics or " +#~ "Piwik. This will be added at the" +#~ " bottom of every page." +#~ msgstr "" + +#~ msgid "" +#~ "Schema of clone URL construction eg. " +#~ "'{scheme}://{user}@{netloc}/{repo}'.\n" +#~ " The " +#~ "following variables are available:\n" +#~ " {scheme}" +#~ " 'http' or 'https' sent from running" +#~ " Kallithea server,\n" +#~ " {user}" +#~ " current user username,\n" +#~ " {netloc}" +#~ " network location/server host of running" +#~ " Kallithea server,\n" +#~ " {repo}" +#~ " full repository name,\n" +#~ " {repoid}" +#~ " ID of repository, can be used " +#~ "to contruct clone-by-id" +#~ msgstr "" + +#~ msgid "enabled" +#~ msgstr "уключана" + +#~ msgid "%s Bookmarks" +#~ msgstr "Закладкі %s" + +#~ msgid "Compare Bookmarks" +#~ msgstr "Параўнаць закладкі" + +#~ msgid "%s Branches" +#~ msgstr "%s Галіны" + +#~ msgid "Compare Branches" +#~ msgstr "Параўнаць галіны" + +#~ msgid "Editing file" +#~ msgstr "Рэдагаванне файла" + +#~ msgid "Update" +#~ msgstr "Абнавіць" + +#~ msgid "" +#~ "Pull requests do not change once " +#~ "created. Select a revision and save " +#~ "to replace this pull request with " +#~ "a new one." +#~ msgstr "" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "Захаваць абнаўленні як новы pull-запыт" + +#~ msgid "%s Tags" +#~ msgstr "%s Тэгаў" + +#~ msgid "Compare Tags" +#~ msgstr "Параўнаць тэгі" + +#~ msgid "" +#~ "Changing status on a changeset " +#~ "associated with a closed pull request" +#~ " is not allowed" +#~ msgstr "Нельга рэдагаваць статус змен, злучаных з зачыненымі pull-request'ами" + +#~ msgid "You have successfully registered into Kallithea" +#~ msgstr "Рэгістрацыя ў Kallithea прайшла паспяхова" + #~ msgid "This pull request can be updated with changes on %s:" #~ msgstr "Гэты pull-запыт можа быць абноўлены з %s:" #~ msgid "Confirm to invalidate repository cache." #~ msgstr "Пацвердзіце скід кэша." +#~ msgid "" +#~ "Changeset status: %s\n" +#~ "Click to open associated pull request %s" +#~ msgstr "" +#~ "Статут набору змен: %s?\n" +#~ "Клікніце, каб перайсці да адпаведнага pull-request'у #%s" + +#~ msgid "Commenting on line {1}." +#~ msgstr "Каментар да радка {1}." + #~ msgid "Comments parsed using %s syntax with %s support." #~ msgstr "" +#~ "Парсінг каментароў выкананы з выкарыстаннем" +#~ " сінтаксісу %s з падтрымкай %s." #~ msgid "Use @username inside this text to notify another user" #~ msgstr "" +#~ "Выкарыстоўвайце @імя_карыстача ў тэксце, каб" +#~ " адправіць абвестку пэўнаму карыстачу" #~ msgid "Comment preview" #~ msgstr "Папярэдні прагляд каментара" @@ -6284,8 +7274,17 @@ #~ msgid "Preview" #~ msgstr "Прадпрагляд" +#~ msgid "Use @username inside this text to notify another user." +#~ msgstr "" +#~ "Выкарыстоўвайце @імя_карыстача ў тэксце, каб" +#~ " адправіць абвестку пэўнаму карыстачу" + #~ msgid "New file mode" #~ msgstr "Рэжым новага файла" +#~ msgid "File is too big to display" +#~ msgstr "Файл занадта вялікай для адлюстравання" + #~ msgid "Save as New Pull Request" #~ msgstr "" + diff -r a48802bf7134 -r 880e2f07651b kallithea/i18n/cs/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Thu Jul 27 03:02:37 2017 +0200 +++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po Thu Jul 27 14:26:14 2017 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2016-03-14 16:51+0100\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: 2015-11-12 08:51+0000\n" "Last-Translator: Michal Čihař \n" "Language-Team: Czech " @@ -19,446 +19,479 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Weblate 2.5-dev\n" -#: kallithea/controllers/changelog.py:85 -#: kallithea/controllers/pullrequests.py:240 kallithea/lib/base.py:515 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:198 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "(zavřeno)" -#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "" -#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 msgid "Ignore whitespace" msgstr "" -#: kallithea/controllers/changeset.py:168 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:744 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "Taková revize neexistuje" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "Prázdný repozitář" + +#: kallithea/controllers/compare.py:73 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 #, fuzzy msgid "No response" msgstr "Neznámá revize %s" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "Nemáte oprávnění k zobrazení této stránky" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:55 +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 +#: kallithea/templates/changeset/changeset.html:195 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: kallithea/controllers/feed.py:84 +#, python-format +msgid "%s committed on %s" +msgstr "" + +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 +#, python-format +msgid "%s %s feed" +msgstr "" + +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 #, python-format msgid "Changes on %s repository" msgstr "Změny na repozitáři %s" -#: kallithea/controllers/feed.py:56 -#, python-format -msgid "%s %s feed" -msgstr "" - -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 -msgid "Changeset was too big and was cut off..." -msgstr "" - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "" - -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:93 msgid "Click here to add new file" msgstr "Klikněte pro přidání nového souboru" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "Zatím nejsou žádné soubory. %s" -#: kallithea/controllers/files.py:195 +#: kallithea/controllers/files.py:191 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:307 kallithea/controllers/files.py:367 -#: kallithea/controllers/files.py:434 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:319 +#: kallithea/controllers/files.py:309 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:330 +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:352 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:356 kallithea/controllers/files.py:422 -#: kallithea/controllers/files.py:503 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:379 +#: kallithea/controllers/files.py:369 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:393 +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:409 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "Žádné změny" -#: kallithea/controllers/files.py:418 kallithea/controllers/files.py:492 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:445 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "Přidaný soubor přes Kallithea" -#: kallithea/controllers/files.py:466 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "Žádný obsah" -#: kallithea/controllers/files.py:470 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "" +#: kallithea/controllers/files.py:517 +msgid "Downloads disabled" +msgstr "Stahování vypnuto" + #: kallithea/controllers/files.py:528 -msgid "Downloads disabled" -msgstr "Stahování vypnuto" - -#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "Neznámá revize %s" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "Prázdný repozitář" -#: kallithea/controllers/files.py:543 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:773 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "Změny" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "Větve" -#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "Tagy" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "Skupiny" -#: kallithea/controllers/home.py:94 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:479 -#: kallithea/templates/base/base.html:653 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "Repozitáře" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "Větev" -#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "" -#: kallithea/controllers/home.py:151 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "Tag" -#: kallithea/controllers/home.py:157 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "Záložka" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:306 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 msgid "Bad captcha" msgstr "Špatná captcha" -#: kallithea/controllers/login.py:150 +#: kallithea/controllers/login.py:148 +#, python-format msgid "You have successfully registered with %s" msgstr "" -#: kallithea/controllers/login.py:195 +#: kallithea/controllers/login.py:193 msgid "A password reset confirmation code has been sent" msgstr "" -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:242 msgid "Invalid password reset token" msgstr "" -#: kallithea/controllers/login.py:249 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "Úspěšně aktualizované heslo" -#: kallithea/controllers/pullrequests.py:123 +#: kallithea/controllers/pullrequests.py:73 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:135 #, python-format msgid "%s (closed)" msgstr "%s (zavřené)" -#: kallithea/controllers/pullrequests.py:151 +#: kallithea/controllers/pullrequests.py:162 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:183 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:184 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 msgid "Bookmarks" msgstr "Záložky" -#: kallithea/controllers/pullrequests.py:312 +#: kallithea/controllers/pullrequests.py:326 #, python-format msgid "Error creating pull request: %s" msgstr "" +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 +msgid "Error occurred while creating pull request" +msgstr "" + #: kallithea/controllers/pullrequests.py:358 -#: kallithea/controllers/pullrequests.py:505 -msgid "No description" -msgstr "" - -#: kallithea/controllers/pullrequests.py:365 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:368 -#: kallithea/controllers/pullrequests.py:455 -#: kallithea/controllers/pullrequests.py:512 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:371 -#: kallithea/controllers/pullrequests.py:458 -msgid "Error occurred while creating pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:403 -msgid "Missing changesets since the previous pull request:" +#: kallithea/controllers/pullrequests.py:381 +msgid "New pull request iteration created" msgstr "" #: kallithea/controllers/pullrequests.py:410 #, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:417 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:426 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:464 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:472 -msgid "Pull request update created" -msgstr "" - -#: kallithea/controllers/pullrequests.py:516 +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:414 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "" + +#: kallithea/controllers/pullrequests.py:439 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:531 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:491 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:599 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:617 -#, python-format -msgid "The following changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:621 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:629 +#: kallithea/controllers/pullrequests.py:552 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:556 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:635 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:571 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:573 +#, python-format +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:738 +#: kallithea/controllers/pullrequests.py:676 #, fuzzy, python-format msgid "Successfully deleted pull request %s" msgstr "Úspěšně aktualizované heslo" -#: kallithea/controllers/pullrequests.py:748 -msgid "Closing." -msgstr "" - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "" -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Došlo k chybě při vyhledávání." -#: kallithea/controllers/summary.py:181 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:184 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "" @@ -470,149 +503,153 @@ msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 msgid "Forever" msgstr "" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "5 minutes" msgstr "5 minut" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 hour" msgstr "1 hodina" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 msgid "1 day" msgstr "1 den" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "1 měsíc" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:290 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "Došlo k chybě při vytváření gist" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:200 msgid "Unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:201 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "Došlo k chybě při aktualizaci hesla uživatele" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "Došlo k chybě při ukládání e-mailové adresy" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:324 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" msgstr "" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -620,608 +657,641 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:336 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:344 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1705 -msgid "Manual activation of external account" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1706 -msgid "Automatic activation of external account" -msgstr "" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:187 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:192 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:249 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "" +#: kallithea/controllers/admin/repo_groups.py:248 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:258 +#, python-format +msgid "This group contains %s repositories and cannot be deleted" +msgstr "" + #: kallithea/controllers/admin/repo_groups.py:265 #, python-format -msgid "Error occurred during update of repository group %s" -msgstr "" - -#: kallithea/controllers/admin/repo_groups.py:283 -#, python-format -msgid "This group contains %s repositories and cannot be deleted" -msgstr "" - -#: kallithea/controllers/admin/repo_groups.py:290 -#, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:296 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:301 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:404 -#: kallithea/controllers/admin/repo_groups.py:439 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:456 -#: kallithea/controllers/admin/repos.py:397 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:151 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/controllers/admin/repos.py:212 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:221 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:224 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:261 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:309 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:312 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:317 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:320 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:325 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:373 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:429 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:443 +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, fuzzy, python-format +#| msgid "Error occurred during gist creation" +msgid "An error occurred during creation of field: %r" +msgstr "Došlo k chybě při vytváření gist" + +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:459 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:490 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:511 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "Nic" -#: kallithea/controllers/admin/repos.py:513 +#: kallithea/controllers/admin/repos.py:473 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:480 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:536 -#: kallithea/controllers/admin/repos.py:563 +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 msgid "Repository has been locked" msgstr "Repozitář byl uzamčen" -#: kallithea/controllers/admin/repos.py:539 -#: kallithea/controllers/admin/repos.py:560 +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 msgid "Repository has been unlocked" msgstr "Repozitář byl odemčen" -#: kallithea/controllers/admin/repos.py:542 -#: kallithea/controllers/admin/repos.py:567 +#: kallithea/controllers/admin/repos.py:502 +#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:533 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:585 +#: kallithea/controllers/admin/repos.py:537 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:603 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:636 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:151 -#: kallithea/controllers/admin/settings.py:248 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:187 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:244 +#: kallithea/controllers/admin/settings.py:189 +#, fuzzy, python-format +#| msgid "Watched Repositories" +msgid "Invalidated %s repositories" +msgstr "Repozitáře" + +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:301 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:306 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:347 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:378 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:392 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:396 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:208 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:219 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:224 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:242 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:217 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:222 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:235 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:462 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:468 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:482 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:737 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:750 +#: kallithea/lib/auth.py:829 +msgid "You need to be a registered user to perform this action" +msgstr "" + +#: kallithea/lib/auth.py:857 +msgid "You need to be signed in to view this page" +msgstr "" + +#: kallithea/lib/base.py:449 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:768 +#: kallithea/lib/base.py:508 msgid "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/auth.py:813 -msgid "You need to be a registered user to perform this action" -msgstr "" - -#: kallithea/lib/auth.py:843 -msgid "You need to be signed in to view this page" -msgstr "" - -#: kallithea/lib/base.py:493 +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:623 -msgid "Changeset not found" -msgstr "" - -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/base.py:617 +#, python-format +msgid "Changeset for %s %s not found in %s" +msgstr "" + +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:613 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "Changeset %s not found" +msgstr "Změny" + +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1128 -#: kallithea/templates/compare/compare_diff.html:71 -#: kallithea/templates/pullrequests/pullrequest_show.html:337 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1469 +#: kallithea/lib/helpers.py:1230 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1229,7 +1299,7 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1237,7 +1307,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:435 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1245,7 +1315,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1253,7 +1323,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:437 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1261,7 +1331,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1269,7 +1339,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:439 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1277,1262 +1347,920 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:455 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:457 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:459 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:462 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:465 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1669 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2237 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2238 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1518 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1701 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1695 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1696 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1715 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1717 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 +#: kallithea/model/db.py:1718 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1719 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1720 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1722 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 +#: kallithea/model/db.py:1723 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1724 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1725 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1727 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1728 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1729 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1730 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1732 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1733 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1735 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1736 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1692 +#: kallithea/model/db.py:1738 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1693 +#: kallithea/model/db.py:1739 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1741 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1742 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1744 #, fuzzy msgid "Only admins can fork repositories" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1745 #, fuzzy msgid "Non-admins can fork repositories" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/model/db.py:1702 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1748 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1749 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2236 +#: kallithea/model/db.py:2276 #, fuzzy msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2239 +#: kallithea/model/db.py:2277 #, fuzzy msgid "Under review" msgstr "" -#: kallithea/model/forms.py:57 -msgid "Please enter a login" +#: kallithea/model/db.py:2278 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2279 +msgid "Approved" msgstr "" #: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 -msgid "Please enter a password" -msgstr "" - #: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:165 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "" +#: kallithea/model/notification.py:240 +#, python-format +msgid "%(user)s commented on changeset %(age)s" +msgstr "" + +#: kallithea/model/notification.py:241 +#, python-format +msgid "%(user)s sent message %(age)s" +msgstr "" + +#: kallithea/model/notification.py:242 +#, python-format +msgid "%(user)s mentioned you %(age)s" +msgstr "" + +#: kallithea/model/notification.py:243 +#, python-format +msgid "%(user)s registered in Kallithea %(age)s" +msgstr "" + +#: kallithea/model/notification.py:244 +#, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:245 +#, python-format +msgid "%(user)s commented on pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:252 +#, python-format +msgid "%(user)s commented on changeset at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:253 +#, python-format +msgid "%(user)s sent message at %(when)s" +msgstr "" + #: kallithea/model/notification.py:254 #, python-format -msgid "%(user)s commented on changeset %(age)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:255 #, python-format -msgid "%(user)s sent message %(age)s" +msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" #: kallithea/model/notification.py:256 #, python-format -msgid "%(user)s mentioned you %(age)s" +msgid "%(user)s opened new pull request at %(when)s" msgstr "" #: kallithea/model/notification.py:257 #, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:266 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:302 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:288 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" + +#: kallithea/model/notification.py:291 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:293 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:307 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:321 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:708 +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" " owners or remove those repository groups: %s" msgstr "" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:368 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:418 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:419 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:96 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:98 +#: kallithea/model/validators.py:75 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:100 +#: kallithea/model/validators.py:77 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" msgstr "" -#: kallithea/model/validators.py:127 +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:111 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + +#: kallithea/model/validators.py:131 +msgid "Invalid user group name" +msgstr "" + +#: kallithea/model/validators.py:132 +#, python-format +msgid "User group \"%(usergroup)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:134 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:154 -msgid "Invalid user group name" -msgstr "" - -#: kallithea/model/validators.py:155 -#, python-format -msgid "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:157 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:197 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:198 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:200 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:258 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:273 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:289 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:304 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:335 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "" -#: kallithea/model/validators.py:351 +#: kallithea/model/validators.py:326 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:353 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:354 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:356 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:470 +#: kallithea/model/validators.py:449 #, fuzzy msgid "Invalid repository URL" msgstr "Prázdný repozitář" -#: kallithea/model/validators.py:471 +#: kallithea/model/validators.py:450 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:496 +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:511 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:513 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:563 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:604 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:697 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:714 +#: kallithea/model/validators.py:692 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:712 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:771 +#: kallithea/model/validators.py:749 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -#: kallithea/model/validators.py:783 +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:784 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:831 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:847 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +#, fuzzy +#| msgid "Repository URL" +msgid "Repository Group" +msgstr "Repozitáře" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:132 +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:244 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:414 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 #, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 msgid "Reset Your Password" msgstr "" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 msgid "Send Password Reset Email" msgstr "" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 msgid "New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 msgid "Confirm New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 msgid "Admin Journal" msgstr "" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, fuzzy, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2541,149 +2269,177 @@ msgstr[2] "" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 #, fuzzy msgid "Repository Defaults" msgstr "Repozitáře" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "" +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 -msgid "Private repository" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 -msgid "" -"Private repositories are only visible to people explicitly added as " -"collaborators." +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 +msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 +msgid "Enable download menu on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 +msgid "Enable locking" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:61 #: kallithea/templates/admin/repos/repo_edit_settings.html:84 -msgid "Enable statistics" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 -msgid "Enable statistics window on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 -msgid "Enable downloads" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 -msgid "Enable download menu on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2692,318 +2448,471 @@ msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 msgid "Never" msgstr "" +#: kallithea/templates/admin/gists/edit.html:145 +msgid "Update Gist" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:146 -msgid "Update Gist" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:147 -#: kallithea/templates/changeset/changeset_file_comment.html:105 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, python-format msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, python-format msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:31 -#: kallithea/templates/changeset/changeset_file_comment.html:95 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:431 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 #, fuzzy msgid "Owned Repositories" msgstr "Repozitáře" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 #, fuzzy msgid "Watched Repositories" msgstr "Repozitáře" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 msgid "Show Permissions" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, python-format msgid "Confirm to reset this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, python-format msgid "Confirm to remove this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 msgid "Remove" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "" @@ -3011,282 +2920,362 @@ msgid "Change Your Account Password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 #, fuzzy msgid "Repositories You Own" msgstr "Umístění repozitářů" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 #, fuzzy msgid "Repositories You are Watching" msgstr "Umístění repozitářů" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 msgid "Mark All Read" msgstr "" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +msgid "Mark as read" +msgstr "" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 msgid "Show Notification" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:430 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 msgid "Default Permissions" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 #, fuzzy msgid "Apply to all existing repositories" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 msgid "Permissions for the Default user on new repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 msgid "Repository group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 msgid "Apply to all existing repository groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 +msgid "Permissions for the Default user on new user groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 +msgid "Top level repository creation" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:55 -msgid "Permissions for the Default user on new user groups." +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 +msgid "Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 +msgid "" +"Note: This will also give all users API access to create repositories " +"everywhere. That might change in future versions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:60 -msgid "Top level repository creation" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, fuzzy, python-format msgid "Confirm to delete this IP address: %s" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "" @@ -3295,31 +3284,42 @@ msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "Nastavení" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "Pokročilé" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "" @@ -3343,12 +3343,14 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3360,16 +3362,34 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "No response" +msgid "Add repos" +msgstr "Neznámá revize %s" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3377,103 +3397,115 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 #, fuzzy msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" +#, fuzzy, python-format +#| msgid "Repository Defaults" +msgid "Repository group %s" +msgstr "Repozitáře" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 msgid "Repository Groups Administration" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 #, fuzzy msgid "Clone remote repository" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3502,94 +3534,115 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, fuzzy, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 msgid "Parent" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 msgid "Public Journal Visibility" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 msgid "Add to Public Journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 msgid "Change Locking" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 msgid "Confirm to unlock repository." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 #, fuzzy msgid "Unlock Repository" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 #, python-format msgid "Locked by %s on %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 #, fuzzy msgid "Confirm to lock repository." msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 #, fuzzy msgid "Lock Repository" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3597,18 +3650,22 @@ "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 #, fuzzy msgid "Delete this Repository" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 #, fuzzy, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" @@ -3616,15 +3673,18 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3635,106 +3695,116 @@ msgid "Invalidate Repository Cache" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "Go to tip of repository" +msgid "Fork of repository" +msgstr "Prázdný repozitář" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 #, fuzzy msgid "Pull Changes from Remote Repository" msgstr "Změny na repozitáři %s" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 #, fuzzy msgid "Confirm to pull changes from remote repository." msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 #, fuzzy msgid "Permanent Repository ID" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3744,35 +3814,35 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 #, fuzzy msgid "Repository URL" msgstr "Repozitáře" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3785,315 +3855,374 @@ msgstr "" #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 #, fuzzy msgid "Repositories Administration" msgstr "Umístění repozitářů" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 msgid "Settings Administration" msgstr "" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems like Google" +" Analytics or Piwik, but also to perform " +"instance-specific customizations like adding a " +"project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 #, fuzzy msgid "Save Settings" msgstr "Nastavení" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 msgid "" "Check this option to remove all comments, pull requests and other records" " related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 +msgid "Install Git hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 +#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " "not seem to come from Kallithea. WARNING: This operation will destroy any" " custom git hooks you may have deployed by hand!" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/templates/admin/settings/settings_mapping.html:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 msgid "Mercurial extensions" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 +msgid "Enable hgsubversion extension" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:47 -msgid "Enable largefiles extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:51 -msgid "Enable hgsubversion extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 #, fuzzy msgid "Location of repositories" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting" " take effect." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4110,102 +4239,126 @@ "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." "\n" -" The following " +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user" +" username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repositories" +msgid "Repository page size" +msgstr "Repozitáře" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 #, fuzzy msgid "Meta Tagging" msgstr "Nastavení" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 msgid "Show Members" msgstr "" @@ -4215,13 +4368,15 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4230,48 +4385,59 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 msgid "User Groups Administration" msgstr "" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "" @@ -4281,12 +4447,14 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "" @@ -4295,7 +4463,8 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4304,402 +4473,453 @@ msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 msgid "Users Administration" msgstr "" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:142 -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:147 +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:154 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:331 +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:155 +#: kallithea/tests/data/templates/base/base.html.py:399 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:157 +#: kallithea/tests/data/templates/base/base.html.py:405 msgid "Lock" msgstr "" +#: kallithea/templates/base/base.html:165 +#: kallithea/tests/data/templates/base/base.html.py:413 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 +msgid "Fork" +msgstr "" + #: kallithea/templates/base/base.html:170 -msgid "Follow" -msgstr "" - -#: kallithea/templates/base/base.html:171 -msgid "Unfollow" -msgstr "" - -#: kallithea/templates/base/base.html:174 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 +msgid "Create Pull Request" msgstr "" #: kallithea/templates/base/base.html:175 -#: kallithea/templates/pullrequests/pullrequest.html:88 -msgid "Create Pull Request" -msgstr "" - -#: kallithea/templates/base/base.html:180 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:485 +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:305 +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "" +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 +msgid "Gists" +msgstr "" + #: kallithea/templates/base/base.html:311 -#: kallithea/templates/base/base.html:312 -msgid "Public journal" -msgstr "" - -#: kallithea/templates/base/base.html:317 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:318 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:322 +#: kallithea/tests/data/templates/base/base.html.py:525 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:330 +#: kallithea/templates/base/base.html:319 +#: kallithea/tests/data/templates/base/base.html.py:540 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:353 -#: kallithea/templates/base/base.html:354 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:377 +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:384 +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 msgid "Login to Your Account" msgstr "" +#: kallithea/templates/base/base.html:385 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:389 +msgid "Don't have an account?" +msgstr "" + #: kallithea/templates/base/base.html:407 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:434 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:615 -msgid "Keyboard shortcuts" -msgstr "" - -#: kallithea/templates/base/base.html:624 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 #, fuzzy msgid "Inherit defaults" msgstr "Repozitáře" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -#, fuzzy -msgid "Add Another Comment" -msgstr "" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - #: kallithea/templates/base/root.html:25 -msgid "Group" +#: kallithea/tests/data/templates/base/root.html.py:85 +#, fuzzy +msgid "Add Another Comment" msgstr "" #: kallithea/templates/base/root.html:26 -msgid "members" +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:27 -msgid "Loading ..." +#: kallithea/tests/data/templates/base/root.html.py:89 +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:28 -msgid "loading ..." +#: kallithea/tests/data/templates/base/root.html.py:91 +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/tests/data/templates/base/root.html.py:93 +msgid "members" msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" +#: kallithea/tests/data/templates/base/root.html.py:95 +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:31 -#, fuzzy -msgid "Open New Pull Request from {0}" -msgstr "Změna stavu-> %s" +#: kallithea/tests/data/templates/base/root.html.py:97 +msgid "loading ..." +msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" +#: kallithea/tests/data/templates/base/root.html.py:99 +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets {0} → {1}" +#: kallithea/tests/data/templates/base/root.html.py:101 +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" -msgstr "" +#: kallithea/tests/data/templates/base/root.html.py:103 +#, fuzzy +msgid "Open New Pull Request from {0}" +msgstr "Změna stavu-> %s" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -#: kallithea/templates/changeset/diff_block.html:21 -msgid "Collapse Diff" +#: kallithea/tests/data/templates/base/root.html.py:105 +msgid "Open New Pull Request for {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:36 -msgid "Expand Diff" +#: kallithea/tests/data/templates/base/root.html.py:107 +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" +#: kallithea/tests/data/templates/base/root.html.py:109 +msgid "Selection Link" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 +msgid "Collapse Diff" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" +#: kallithea/tests/data/templates/base/root.html.py:113 +msgid "Expand Diff" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/base/root.html.py:115 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 msgid "Specify changeset" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." msgstr "" #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" @@ -4707,206 +4927,286 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 #, fuzzy msgid "Go to tip of repository" msgstr "Prázdný repozitář" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 #, python-format msgid "" "Changeset status: %s by %s\n" "Click to open associated pull request %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/changelog/changelog_summary_data.html:24 +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 #, fuzzy, python-format -#| msgid "Set changeset status" msgid "Changeset status: %s by %s" msgstr "Změny" +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 +msgid "Expand commit message" +msgstr "" + #: kallithea/templates/changelog/changelog.html:116 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:125 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:57 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:141 -#: kallithea/templates/changelog/changelog_summary_data.html:63 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#: kallithea/templates/compare/compare_cs.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:203 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:146 -#: kallithea/templates/changelog/changelog_summary_data.html:68 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:311 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:47 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:87 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:93 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 #, fuzzy msgid "Push new repository" msgstr "Prázdný repozitář" -#: kallithea/templates/changelog/changelog_summary_data.html:101 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:39 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:75 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 msgid "Merge" msgstr "" +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 +msgid "Grafted from:" +msgstr "" + #: kallithea/templates/changeset/changeset.html:123 -msgid "Grafted from:" +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 +msgid "Transplanted from:" msgstr "" #: kallithea/templates/changeset/changeset.html:129 -msgid "Transplanted from:" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:329 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4914,9 +5214,12 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:62 -#: kallithea/templates/pullrequests/pullrequest_show.html:331 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4924,98 +5227,124 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:231 -#: kallithea/templates/changeset/changeset.html:268 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 #, fuzzy msgid "No revisions" msgstr "Neznámá revize %s" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 #, fuzzy msgid "on pull request" msgstr "Změna stavu-> %s" -#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 msgid "No title" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 #, fuzzy msgid "on this changeset" msgstr "Žádné změny" -#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 #, fuzzy msgid "Delete comment?" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 #, fuzzy msgid "Status change" msgstr "Změna stavu-> %s" -#: kallithea/templates/changeset/changeset_file_comment.html:59 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 msgid "Commenting on line." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:60 +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 msgid "" "Comments are in plain text. Use @username inside this text to notify " "another user." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 #, fuzzy msgid "Set changeset status" msgstr "Změny" -#: kallithea/templates/changeset/changeset_file_comment.html:69 +#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:75 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 #, fuzzy msgid "No change" msgstr "Žádné změny" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 #, fuzzy msgid "Finish pull request" msgstr "Změna stavu-> %s" -#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 #, fuzzy msgid "Close" msgstr "(zavřeno)" -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 msgid "Submitting ..." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:104 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:116 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -5023,7 +5352,8 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:129 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, fuzzy, python-format msgid "%d inline" msgid_plural "%d inline" @@ -5031,7 +5361,8 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:130 +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 #, python-format msgid "%d general" msgid_plural "%d general" @@ -5040,108 +5371,160 @@ msgstr[2] "" #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +msgid "Modified" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 msgid "Deleted" msgstr "" -#: kallithea/templates/changeset/diff_block.html:57 +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 msgid "Renamed" msgstr "" -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Neznámá revize %s" + +#: kallithea/templates/changeset/diff_block.html:52 +msgid "No file after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:69 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:83 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "" #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:85 +#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:321 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:99 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:107 +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:108 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, fuzzy, python-format msgid "%s changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:109 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 msgid "behind" msgstr "" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "" #: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "" #: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5149,113 +5532,179 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "Comment on Changeset \"%s\"" +msgstr "Změny" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changesets" +msgid "Changeset on" +msgstr "Změny" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Větev" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Změna stavu-> %s" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "Repository has been locked" +msgid "The pull request has been closed." +msgstr "Repozitář byl uzamčen" + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 msgid "We have received a request to reset the password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:8 +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 msgid "" "This account is however managed outside this system and the password " "cannot be changed here." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:13 +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "on pull request" +msgid "Pull request from" +msgstr "Změna stavu-> %s" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +msgid "at" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "on pull request" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "Změna stavu-> %s" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" msgstr "" #: kallithea/templates/files/diff_2way.html:15 @@ -5274,83 +5723,105 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 +#: kallithea/tests/data/templates/files/files_add.html.py:241 msgid "New file type" msgstr "" -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 #, fuzzy msgid "Commit Changes" msgstr "Žádné změny" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:62 -msgid "Last Revision" -msgstr "" - #: kallithea/templates/files/files_browser.html:63 -msgid "Last Modified" +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 +msgid "Size" msgstr "" #: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 msgid "Last Committer" msgstr "" @@ -5360,7 +5831,7 @@ msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5373,25 +5844,24 @@ msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" @@ -5399,84 +5869,104 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "" -#: kallithea/templates/files/files_source.html:74 +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 msgid "File is too big to display." msgstr "" -#: kallithea/templates/files/files_source.html:76 +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 msgid "Show full annotation anyway." msgstr "" -#: kallithea/templates/files/files_source.html:78 +#: kallithea/templates/files/files_source.html:73 +#: kallithea/tests/data/templates/files/files_source.html.py:133 msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "" @@ -5485,70 +5975,80 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 -msgid "ATOM journal feed" -msgstr "" - #: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "" @@ -5562,34 +6062,45 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "" @@ -5624,7 +6135,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "" @@ -5642,33 +6155,41 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, python-format msgid "%s Pull Request %s" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, python-format msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" @@ -5676,88 +6197,113 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 #, fuzzy msgid "There are no reviewers" msgstr "Zatím nejsou žádné soubory. %s" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 msgid "on" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:215 +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 msgid "" -"Pull requests do not change once created. Select a revision and save to " -"replace this pull request with a new one." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:224 +"Pull request iterations do not change content once created. Select a " +"revision and save to make a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +#, fuzzy +msgid "Cancel Changes" +msgstr "Žádné změny" + +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 msgid "Pull Request Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:249 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 #, fuzzy msgid "Remove reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:269 +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 #, fuzzy msgid "Potential Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:272 +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:295 -msgid "Save Changes" +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 +msgid "Pull Request Content" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:296 -msgid "Save Updates as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:297 -#, fuzzy -msgid "Cancel Changes" -msgstr "Žádné změny" - -#: kallithea/templates/pullrequests/pullrequest_show.html:307 -msgid "Pull Request Content" +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +msgid "Common ancestor" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 @@ -5775,240 +6321,464 @@ msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 msgid "Search in All Repositories" msgstr "" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "" +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "" + #: kallithea/templates/summary/statistics.html:390 -msgid "commits" +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" msgstr "" #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" +#: kallithea/tests/data/templates/summary/statistics.html.py:153 +msgid "files removed" msgstr "" #: kallithea/templates/summary/statistics.html:393 -msgid "files removed" +#: kallithea/tests/data/templates/summary/statistics.html.py:155 +msgid "commit" +msgstr "" + +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 +msgid "file added" msgstr "" #: kallithea/templates/summary/statistics.html:395 -msgid "commit" +#: kallithea/tests/data/templates/summary/statistics.html.py:159 +msgid "file changed" msgstr "" #: kallithea/templates/summary/statistics.html:396 -msgid "file added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:397 -msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "" +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 +msgid "Show by ID" +msgstr "" + #: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/summary/summary.html.py:143 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "" +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 +msgid "Download" +msgstr "" + +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 +msgid "Downloads are disabled for this repository" +msgstr "" + #: kallithea/templates/summary/summary.html:108 -msgid "Download" +#: kallithea/tests/data/templates/summary/summary.html.py:190 +msgid "Download as zip" msgstr "" #: kallithea/templates/summary/summary.html:112 -msgid "There are no downloads yet" +#: kallithea/tests/data/templates/summary/summary.html.py:194 +msgid "Check this to download archive with subrepos" msgstr "" #: kallithea/templates/summary/summary.html:114 -msgid "Downloads are disabled for this repository" -msgstr "" - -#: kallithea/templates/summary/summary.html:120 -msgid "Download as zip" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 -msgid "Check this to download archive with subrepos" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 +#: kallithea/tests/data/templates/summary/summary.html.py:196 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 #, fuzzy msgid "Latest Changes" msgstr "Změna stavu-> %s" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "" +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." +"\n" +" The following " +"variables are available:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "" +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +msgid "The comment was made with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" msgstr "" #~ msgid "increase diff context to %(num)s lines" @@ -6062,9 +6832,6 @@ #~ msgid "No Files" #~ msgstr "" -#~ msgid "" -#~ msgstr "" - #~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" #~ msgstr "" @@ -6407,8 +7174,235 @@ #~ msgid "Pull Requests from %s'" #~ msgstr "" +#~ msgid "Missing changesets since the previous pull request:" +#~ msgstr "" + +#~ msgid "New changesets on %s %s since the previous pull request:" +#~ msgstr "" + +#~ msgid "Ancestor didn't change - show diff since previous version:" +#~ msgstr "" + #~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request %s" -#~ msgstr "" - +#~ "This pull request is based on " +#~ "another %s revision and there is " +#~ "no simple diff." +#~ msgstr "" + +#~ msgid "No changes found on %s %s since previous version." +#~ msgstr "" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "" + +#~ msgid "Pull request update created" +#~ msgstr "" + +#~ msgid "The following changes are available on %s:" +#~ msgstr "" + +#~ msgid "No changesets found for updating this pull request." +#~ msgstr "" + +#~ msgid "Git pull requests don't support updates yet." +#~ msgstr "" + +#~ msgid "Closing." +#~ msgstr "" + +#~ msgid "An error occurred during creation of field" +#~ msgstr "" + +#~ msgid "Changeset not found" +#~ msgstr "" + +#~ msgid "Repository no access" +#~ msgstr "" + +#~ msgid "Repository read access" +#~ msgstr "" + +#~ msgid "Repository write access" +#~ msgstr "" + +#~ msgid "Repository admin access" +#~ msgstr "" + +#~ msgid "Repository Group no access" +#~ msgstr "" + +#~ msgid "Repository Group read access" +#~ msgstr "" + +#~ msgid "Repository Group write access" +#~ msgstr "" + +#~ msgid "Repository Group admin access" +#~ msgstr "" + +#~ msgid "Repository creation disabled" +#~ msgstr "" + +#~ msgid "Repository creation enabled" +#~ msgstr "" + +#~ msgid "Repository forking disabled" +#~ msgstr "" + +#~ msgid "Repository forking enabled" +#~ msgstr "" + +#~ msgid "Register disabled" +#~ msgstr "" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "" + +#~ msgid "Not Reviewed" +#~ msgstr "" + +#~ msgid "Rejected" +#~ msgstr "" + +#~ msgid "Under Review" +#~ msgstr "" + +#~ msgid "Repository group no access" +#~ msgstr "" + +#~ msgid "Repository group read access" +#~ msgstr "" + +#~ msgid "Repository group write access" +#~ msgstr "" + +#~ msgid "Repository group admin access" +#~ msgstr "" + +#~ msgid "User group no access" +#~ msgstr "" + +#~ msgid "User group read access" +#~ msgstr "" + +#~ msgid "User group write access" +#~ msgstr "" + +#~ msgid "User group admin access" +#~ msgstr "" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "" + +#~ msgid "User Group creation disabled" +#~ msgstr "" + +#~ msgid "User Group creation enabled" +#~ msgstr "" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "" + +#~ msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "repositories" +#~ msgstr "" + +#~ msgid "No repositories found." +#~ msgstr "" + +#~ msgid "There are no branches yet" +#~ msgstr "" + +#~ msgid "There are no tags yet" +#~ msgstr "" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "" + +#~ msgid "Analytics HTML block" +#~ msgstr "" + +#~ msgid "" +#~ "HTML with JavaScript for web analytics" +#~ " systems like Google Analytics or " +#~ "Piwik. This will be added at the" +#~ " bottom of every page." +#~ msgstr "" + +#~ msgid "" +#~ "Schema of clone URL construction eg. " +#~ "'{scheme}://{user}@{netloc}/{repo}'.\n" +#~ " The " +#~ "following variables are available:\n" +#~ " {scheme}" +#~ " 'http' or 'https' sent from running" +#~ " Kallithea server,\n" +#~ " {user}" +#~ " current user username,\n" +#~ " {netloc}" +#~ " network location/server host of running" +#~ " Kallithea server,\n" +#~ " {repo}" +#~ " full repository name,\n" +#~ " {repoid}" +#~ " ID of repository, can be used " +#~ "to contruct clone-by-id" +#~ msgstr "" + +#~ msgid "enabled" +#~ msgstr "" + +#~ msgid "disabled" +#~ msgstr "" + +#~ msgid "%s Bookmarks" +#~ msgstr "" + +#~ msgid "Compare Bookmarks" +#~ msgstr "" + +#~ msgid "%s Branches" +#~ msgstr "" + +#~ msgid "Compare Branches" +#~ msgstr "" + +#~ msgid "Editing file" +#~ msgstr "" + +#~ msgid "Update" +#~ msgstr "" + +#~ msgid "" +#~ "Pull requests do not change once " +#~ "created. Select a revision and save " +#~ "to replace this pull request with " +#~ "a new one." +#~ msgstr "" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "" + +#~ msgid "%s Tags" +#~ msgstr "" + +#~ msgid "Compare Tags" +#~ msgstr "" + diff -r a48802bf7134 -r 880e2f07651b kallithea/i18n/de/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Thu Jul 27 03:02:37 2017 +0200 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Thu Jul 27 14:26:14 2017 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2016-03-14 16:51+0100\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: 2017-04-26 09:50+0000\n" "Last-Translator: Marko Semet (Marko10.000) \n" "Language-Team: German " @@ -19,83 +19,106 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 2.14-dev\n" -#: kallithea/controllers/changelog.py:85 -#: kallithea/controllers/pullrequests.py:240 kallithea/lib/base.py:515 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "Es gibt noch keine Änderungssätze" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "Keine" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:198 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "(geschlossen)" -#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "Zeige unsichtbare Zeichen" -#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 msgid "Ignore whitespace" msgstr "Ignoriere unsichtbare Zeichen" -#: kallithea/controllers/changeset.py:168 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Erhöhe diff-Kontext auf %(num)s Zeilen" -#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:744 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "Die angegebene Version existiert nicht in diesem Repository" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "Änderungssätze auswählen" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "Gehe zum Tip des Repositorys" + +#: kallithea/controllers/compare.py:73 +#, fuzzy +#| msgid "Cannot compare repositories without using common ancestor" +msgid "Cannot compare repositories of different types" +msgstr "" +"Ohne einen gemeinsamen Vorfahren ist ein Vergleich der Repositories nicht" +" möglich" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "" "Ohne einen gemeinsamen Vorfahren ist ein Vergleich der Repositories nicht" " möglich" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 msgid "No response" msgstr "Keine Rückmeldung" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "Unbekannter Fehler" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" "Die Anfrage konnte wegen ungültiger Syntax vom Server nicht ausgewertet " "werden." -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Unauthorisierter Zugang zur Ressource" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "Du hast keine Rechte, um diese Seite zu betrachten" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "Die Ressource konnte nicht gefunden werden" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -103,375 +126,394 @@ "Aufgrund einer unerwarteten Gegebenheit konnte der Server diese Anfrage " "nicht vollenden." -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "Änderungen im %s Repository" - -#: kallithea/controllers/feed.py:56 -#, python-format -msgid "%s %s feed" -msgstr "%s %s Feed" - -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 msgid "Changeset was too big and was cut off..." msgstr "Der Änderungssatz war zu groß und wurde abgeschnitten..." -#: kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:84 #, python-format msgid "%s committed on %s" msgstr "%s committed am %s" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 +#, python-format +msgid "%s %s feed" +msgstr "%s %s Feed" + +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 +#, python-format +msgid "Changes on %s repository" +msgstr "Änderungen im %s Repository" + +#: kallithea/controllers/files.py:93 msgid "Click here to add new file" msgstr "Hier klicken, um eine neue Datei hinzuzufügen" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "Es gibt hier noch keine Dateien. %s" -#: kallithea/controllers/files.py:195 +#: kallithea/controllers/files.py:191 #, python-format msgid "%s at %s" msgstr "%s auf %s" -#: kallithea/controllers/files.py:307 kallithea/controllers/files.py:367 -#: kallithea/controllers/files.py:434 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Dieses Repository ist von %s am %s gesperrt worden" -#: kallithea/controllers/files.py:319 +#: kallithea/controllers/files.py:309 #, fuzzy msgid "You can only delete files with revision being a valid branch" -msgstr "" -"Dateien können nur gelöscht werden, deren Revision ein gültiger Branch ist" - -#: kallithea/controllers/files.py:330 +msgstr "Dateien können nur gelöscht werden, deren Revision ein gültiger Branch ist" + +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Datei %s via Kallithea gelöscht" -#: kallithea/controllers/files.py:352 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "Datei %s erfolgreich gelöscht" -#: kallithea/controllers/files.py:356 kallithea/controllers/files.py:422 -#: kallithea/controllers/files.py:503 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "Während des Commits trat ein Fehler auf" -#: kallithea/controllers/files.py:379 +#: kallithea/controllers/files.py:369 #, fuzzy msgid "You can only edit files with revision being a valid branch" -msgstr "" -"Dateien können nur editiert werden, deren Revision ein gültiger Branch ist" - -#: kallithea/controllers/files.py:393 +msgstr "Dateien können nur editiert werden, deren Revision ein gültiger Branch ist" + +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "Datei %s via Kallithea editiert" -#: kallithea/controllers/files.py:409 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "Keine Änderungen" -#: kallithea/controllers/files.py:418 kallithea/controllers/files.py:492 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "Der Commit zu %s war erfolgreich" -#: kallithea/controllers/files.py:445 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "Datei via Kallithea hinzugefügt" -#: kallithea/controllers/files.py:466 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "Kein Inhalt" -#: kallithea/controllers/files.py:470 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "Kein Dateiname" -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "Der Ort muss ein relativer Pfad sein und darf nicht .. enthalten" +#: kallithea/controllers/files.py:517 +msgid "Downloads disabled" +msgstr "Downloads gesperrt" + #: kallithea/controllers/files.py:528 -msgid "Downloads disabled" -msgstr "Downloads gesperrt" - -#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "Unbekannte Revision %s" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "Leeres Repository" -#: kallithea/controllers/files.py:543 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "Unbekannter Archivtyp" -#: kallithea/controllers/files.py:773 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "Änderungssätze" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "Entwicklungszweige" -#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "Tags" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "Während des Forkens des Repositorys trat ein Fehler auf: %s" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "Gruppen" -#: kallithea/controllers/home.py:94 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:479 -#: kallithea/templates/base/base.html:653 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "Repositories" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "Zweig" -#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "Geschlossene Branches" -#: kallithea/controllers/home.py:151 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "Marke" -#: kallithea/controllers/home.py:157 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "Lesezeichen" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "Öffentliches Logbuch" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:306 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "Logbuch" -#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 msgid "Bad captcha" msgstr "Falsches Captcha" -#: kallithea/controllers/login.py:150 +#: kallithea/controllers/login.py:148 +#, python-format msgid "You have successfully registered with %s" msgstr "Sie haben sich erfolgreich bei %s registriert" -#: kallithea/controllers/login.py:195 +#: kallithea/controllers/login.py:193 msgid "A password reset confirmation code has been sent" msgstr "Ihr Link um das Passwort zurückzusetzen wurde versendet" -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:242 msgid "Invalid password reset token" msgstr "Ungültiges Token zum Zurücksetzen des Passworts." -#: kallithea/controllers/login.py:249 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "Erfolgreich Kennwort geändert" -#: kallithea/controllers/pullrequests.py:123 +#: kallithea/controllers/pullrequests.py:73 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:135 #, python-format msgid "%s (closed)" msgstr "%s (geschlossen)" -#: kallithea/controllers/pullrequests.py:151 +#: kallithea/controllers/pullrequests.py:162 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 msgid "Changeset" msgstr "Änderungssatz" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:183 msgid "Special" msgstr "Spezial" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:184 msgid "Peer branches" msgstr "Branches anderer" -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 msgid "Bookmarks" msgstr "Lesezeichen" -#: kallithea/controllers/pullrequests.py:312 +#: kallithea/controllers/pullrequests.py:326 #, python-format msgid "Error creating pull request: %s" msgstr "Fehler beim Erstellen des Pull-Requests: %s" +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 +msgid "Error occurred while creating pull request" +msgstr "Während des Erstellens des Pull Requests trat ein Fehler auf" + #: kallithea/controllers/pullrequests.py:358 -#: kallithea/controllers/pullrequests.py:505 -msgid "No description" -msgstr "Keine Beschreibung" - -#: kallithea/controllers/pullrequests.py:365 msgid "Successfully opened new pull request" msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet" -#: kallithea/controllers/pullrequests.py:368 -#: kallithea/controllers/pullrequests.py:455 -#: kallithea/controllers/pullrequests.py:512 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:371 -#: kallithea/controllers/pullrequests.py:458 -msgid "Error occurred while creating pull request" -msgstr "Während des Erstellens des Pull Requests trat ein Fehler auf" - -#: kallithea/controllers/pullrequests.py:403 -msgid "Missing changesets since the previous pull request:" -msgstr "Fehlende Changesets seit letztem Pull Request:" +#: kallithea/controllers/pullrequests.py:381 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" +msgstr "Pull Request Update erstellt" #: kallithea/controllers/pullrequests.py:410 #, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "Neue Changesets in %s %s seit dem letzten Pull Request:" - -#: kallithea/controllers/pullrequests.py:417 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "Vorgänger unverändert - zeige Diff zu lezter Version:" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" -"Dieser Pull Request basiert auf einer anderen %s Revision. Daher ist kein" -" Simple Diff verfügbar." - -#: kallithea/controllers/pullrequests.py:426 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "Keine Änderungen seit der letzten Version gefunden in %s %s." - -#: kallithea/controllers/pullrequests.py:464 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "Geschlossen, ersetzt durch %s." - -#: kallithea/controllers/pullrequests.py:472 -msgid "Pull request update created" -msgstr "Pull Request Update erstellt" - -#: kallithea/controllers/pullrequests.py:516 +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:414 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "Keine Beschreibung" + +#: kallithea/controllers/pullrequests.py:439 msgid "Pull request updated" msgstr "Pull Request aktualisiert" -#: kallithea/controllers/pullrequests.py:531 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "Erfolgreich Pull-Request gelöscht" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:491 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "Keine Changesets gefunden, um den Pull Request zu aktualisieren." + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "Dieser Pull Request wurde bereits in %s integriert." -#: kallithea/controllers/pullrequests.py:599 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "" "Dieser Pull Request wurde geschlossen und kann daher nicht aktualisiert " "werden." -#: kallithea/controllers/pullrequests.py:617 -#, python-format -msgid "The following changes are available on %s:" +#: kallithea/controllers/pullrequests.py:552 +#, fuzzy, python-format +#| msgid "The following changes are available on %s:" +msgid "The following additional changes are available on %s:" msgstr "Die folgenden Änderungen sind verfügbar unter %s:" -#: kallithea/controllers/pullrequests.py:621 -msgid "No changesets found for updating this pull request." +#: kallithea/controllers/pullrequests.py:556 +#, fuzzy +#| msgid "No changesets found for updating this pull request." +msgid "No additional changesets found for iterating on this pull request." msgstr "Keine Changesets gefunden, um den Pull Request zu aktualisieren." -#: kallithea/controllers/pullrequests.py:629 +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Hinweis: Branch %s hat einen anderen Head: %s." -#: kallithea/controllers/pullrequests.py:635 -msgid "Git pull requests don't support updates yet." +#: kallithea/controllers/pullrequests.py:571 +#, fuzzy +#| msgid "Git pull requests don't support updates yet." +msgid "Git pull requests don't support iterating yet." msgstr "Git Pull Request unterstützen bisher keine Updates." -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:573 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "Keine Changesets gefunden, um den Pull Request zu aktualisieren." + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 msgid "No permission to change pull request status" msgstr "Keine Berechtigung zum Ändern des Pull Request Status" -#: kallithea/controllers/pullrequests.py:738 +#: kallithea/controllers/pullrequests.py:676 #, python-format msgid "Successfully deleted pull request %s" msgstr "Pull-Request %s erfolgreich gelöscht" -#: kallithea/controllers/pullrequests.py:748 -msgid "Closing." -msgstr "Schließen." - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "Ungültige Suchanfrage. Versuchen sie es in Anführungzeichen zu setzen." -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "Es gibt keinen durchsuchbaren Index. Bitte den Whoosh Indizierer ausführen" -#: kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Während der Suchoperation trat ein Fehler auf." -#: kallithea/controllers/summary.py:181 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 msgid "No data ready yet" msgstr "Es stehen noch keine Daten zur Verfügung" -#: kallithea/controllers/summary.py:184 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "Statistiken sind deaktiviert für dieses Repository" @@ -483,151 +525,155 @@ msgid "error occurred during update of auth settings" msgstr "Fehler bei der Änderung der Anmeldeeinstellungen aufgetreten" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "Standardeinstellungen erfolgreich geupdated" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "Ein Fehler trat beim updaten der Standardeinstellungen auf" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 msgid "Forever" msgstr "Immer" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "5 minutes" msgstr "5 Minuten" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 hour" msgstr "1 Stunde" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 msgid "1 day" msgstr "1 Tag" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "1 Monat" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:290 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "Lebenszeit" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "Ein fehler trat auf bei der Erstellung des gist" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "gist %s gelöscht" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:200 msgid "Unmodified" msgstr "Ungeändert" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "Erfolgreich Kerninhalt aktualisiert" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "Erfolgreich Kerndaten aktualisiert" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "Fehler beim Aktualisieren der Kerndaten %s" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Sie können diesen Benutzer nicht editieren, da er von entscheidender " "Bedeutung für die ganze Applikation ist" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "Ihr Account wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:201 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "Fehler beim Aktualisieren der Benutzer %s" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "Fehler bei der Änderung des Kennworts" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "Die EMail Addresse %s wurde zum Benutzer hinzugefügt" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "Währen der Speicherung der EMail Addresse trat ein Fehler auf" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "Die EMail Addresse wurde vom Benutzer entfernt" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "API Key wurde erfolgreich erstellt" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "API-Schlüssel erfolgreich zurückgesetzt" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:324 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "API-Schlüssel erfolgreich gelöscht" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "Lesen" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" -msgstr "Schreiben" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" +msgstr "Lesen" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "Schreiben" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -635,281 +681,298 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:336 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:344 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "Admin" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "Deaktiviert" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "Erlaubt mit manueller Kontoaktivierung" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "Erlaubt mit automatischer Kontoaktivierung" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1705 -msgid "Manual activation of external account" -msgstr "Manuelle Aktivierung externen Kontos" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1706 -msgid "Automatic activation of external account" -msgstr "Automatische Aktivierung externen Kontos" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "Deaktiviert" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "Erlaubt mit manueller Kontoaktivierung" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "Erlaubt mit automatischer Kontoaktivierung" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "Manuelle Aktivierung externen Kontos" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "Automatische Aktivierung externen Kontos" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "Aktiviert" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "Globale Berechtigungen erfolgreich geändert" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Fehler bei der Änderung der globalen Berechtigungen" -#: kallithea/controllers/admin/repo_groups.py:187 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Fehler bei der Erstellung der Repositoriumsgruppe %s" -#: kallithea/controllers/admin/repo_groups.py:192 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "Repositoriumsgruppe %s erstellt" -#: kallithea/controllers/admin/repo_groups.py:249 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "Repositoriumsgruppe %s aktualisiert" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:248 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Fehler bei der Aktualisierung der Repositoriumsgruppe %s" -#: kallithea/controllers/admin/repo_groups.py:283 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Die Gruppe enthält %s Repositorys und kann nicht gelöscht werden" -#: kallithea/controllers/admin/repo_groups.py:290 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Diese Gruppe enthält %s Untergruppen und kann nicht gelöscht werden" -#: kallithea/controllers/admin/repo_groups.py:296 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "Repositoriumsgruppe %s entfernt" -#: kallithea/controllers/admin/repo_groups.py:301 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Fehler beim Löschen der Repositoriumsgruppe %s" -#: kallithea/controllers/admin/repo_groups.py:404 -#: kallithea/controllers/admin/repo_groups.py:439 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "Als Administrator kann man sich keine Berechtigungen entziehen" -#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "Berechtigungen der Repositoriumsgruppe aktualisiert" -#: kallithea/controllers/admin/repo_groups.py:456 -#: kallithea/controllers/admin/repos.py:397 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "Fehler beim Entzug der Berechtigungen" -#: kallithea/controllers/admin/repos.py:151 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "Fehler beim Erstellen des Repositoriums %s" -#: kallithea/controllers/admin/repos.py:212 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "Repositorium %s von %s erstellt" -#: kallithea/controllers/admin/repos.py:221 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "Aufgespaltenes Repositorium %s zu %s" -#: kallithea/controllers/admin/repos.py:224 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "Repositorium erzeugt %s" -#: kallithea/controllers/admin/repos.py:261 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "Repository %s wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "Fehler bei der Aktualisierung des Repositoriums %s" -#: kallithea/controllers/admin/repos.py:309 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "%s Spaltung abgetrennt" -#: kallithea/controllers/admin/repos.py:312 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "%s Spaltung gelöscht" -#: kallithea/controllers/admin/repos.py:317 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "Repositorium %s gelöscht" -#: kallithea/controllers/admin/repos.py:320 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "%s konnte nicht gelöscht werden, da es noch Forks besitzt" -#: kallithea/controllers/admin/repos.py:325 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "Beim Löschen von %s trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:373 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "Repositoriumsberechtigungen aktualisiert" -#: kallithea/controllers/admin/repos.py:429 -msgid "An error occurred during creation of field" +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, fuzzy, python-format +#| msgid "An error occurred during creation of field" +msgid "An error occurred during creation of field: %r" msgstr "Fehler während der Erzeugung des Feldes" -#: kallithea/controllers/admin/repos.py:443 +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "Fehler beim Entfernen des Feldes" -#: kallithea/controllers/admin/repos.py:459 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "-- Keine Abspaltung --" -#: kallithea/controllers/admin/repos.py:490 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "Sichtbarkeit des Repositorys im Öffentlichen Logbuch aktualisiert" -#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "" "Es trat ein Fehler während der Aktualisierung der Sicherbarkeit dieses " "Repositorys im Öffentlichen Logbuch auf" -#: kallithea/controllers/admin/repos.py:511 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "Nichts" -#: kallithea/controllers/admin/repos.py:513 +#: kallithea/controllers/admin/repos.py:473 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Markiere Repository %s als Abzweig von Repository %s" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:480 msgid "An error occurred during this operation" msgstr "Während dieser operation trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:536 -#: kallithea/controllers/admin/repos.py:563 +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 msgid "Repository has been locked" msgstr "Repository wurde gesperrt" -#: kallithea/controllers/admin/repos.py:539 -#: kallithea/controllers/admin/repos.py:560 +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 msgid "Repository has been unlocked" msgstr "Repository nicht mehr gesperrt" -#: kallithea/controllers/admin/repos.py:542 -#: kallithea/controllers/admin/repos.py:567 +#: kallithea/controllers/admin/repos.py:502 +#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during unlocking" msgstr "Fehler beim Entsperren" -#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:533 msgid "Cache invalidation successful" msgstr "Cache Entfernung war erfolgreich" -#: kallithea/controllers/admin/repos.py:585 +#: kallithea/controllers/admin/repos.py:537 msgid "An error occurred during cache invalidation" msgstr "Währen der Cache Invalidierung trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "Von entferntem Ort übertragen" -#: kallithea/controllers/admin/repos.py:603 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "" "Es trat ein Fehler auf während das Repository von einem Entfernten " "Speicherort übertragen wurde" -#: kallithea/controllers/admin/repos.py:636 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "Während des löschens der Repository Statistiken trat ein Fehler auf" -#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "VCS-Einstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -917,340 +980,357 @@ "hgsubversion-Unterstützung konnte nicht aktiviert werden. Die " "\"hgsubversion\"-Bibliothek fehlt" -#: kallithea/controllers/admin/settings.py:151 -#: kallithea/controllers/admin/settings.py:248 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "" "Ein Fehler ist während der Aktualisierung der Applikationseinstellungen " "aufgetreten" -#: kallithea/controllers/admin/settings.py:187 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" "Die Repositories wurden erfolgreich überprüft. Hinzugefügt: %s. Entfernt:" " %s." -#: kallithea/controllers/admin/settings.py:244 +#: kallithea/controllers/admin/settings.py:189 +#, fuzzy, python-format +#| msgid "Invalidate Repository Cache" +msgid "Invalidated %s repositories" +msgstr "Ungültiger Repositorycache" + +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "Anwendungseinstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:301 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Visualisierungseinstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:306 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" "Es ist ein Fehler während der Aktualisierung der Layouteinstellung " "aufgetreten" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Bitte gebe eine E-Mailadresse an" -#: kallithea/controllers/admin/settings.py:347 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "Task zum Versenden von E-Mails erstellt" -#: kallithea/controllers/admin/settings.py:378 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "Neuer Hook hinzugefügt" -#: kallithea/controllers/admin/settings.py:392 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "Die Hooks wurden aktutalisiert" -#: kallithea/controllers/admin/settings.py:396 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "Während der Erzeugung des Hooks ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "Whoosh Reindizierungs Aufgabe wurde zur Ausführung geplant" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "Nutzergruppe %s erstellt" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Es ist ein Fehler während der Erstellung der Nutzergruppe %s aufgetreten" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "Aktualisierte Nutzergruppe %s" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:208 #, python-format msgid "Error occurred during update of user group %s" msgstr "Während des Updates der Benutzergruppe %s ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:219 msgid "Successfully deleted user group" msgstr "Die Nutzergruppe wurde erfolgreich entfernt" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:224 msgid "An error occurred during deletion of user group" msgstr "Während des Löschens der Benutzergruppe ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "Zielgruppe kann nicht die gleiche Gruppe sein" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "Berechtigungen der Benutzergruppe wurden aktualisiert" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "Berechtigungen wurden aktualisiert" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "Es ist ein Fehler während des Speicherns der Berechtigungen aufgetreten" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "Nutzer %s erstellt" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "Während des Erstellens des Benutzers %s ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "Der Benutzer wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/users.py:217 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "Der Nutzer wurde erfolgreich gelöscht" -#: kallithea/controllers/admin/users.py:222 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "Während der Löschen des Benutzers trat ein Fehler auf" -#: kallithea/controllers/admin/users.py:235 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "Der Standard-Benutzer kann nicht bearbeitet werden" -#: kallithea/controllers/admin/users.py:462 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "Die IP-Adresse %s wurde zur Nutzerwhitelist hinzugefügt" -#: kallithea/controllers/admin/users.py:468 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "Während des Speicherns der IP-Adresse ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/users.py:482 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "IP-Adresse wurde von der Nutzerwhitelist entfernt" -#: kallithea/lib/auth.py:737 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "IP-Adresse %s ist nicht erlaubt" -#: kallithea/lib/auth.py:750 -msgid "Invalid API key" -msgstr "Ungültiger API Key" - -#: kallithea/lib/auth.py:768 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:813 +#: kallithea/lib/auth.py:829 msgid "You need to be a registered user to perform this action" msgstr "Sie müssen ein Registrierter Nutzer sein um diese Aktion durchzuführen" -#: kallithea/lib/auth.py:843 +#: kallithea/lib/auth.py:857 msgid "You need to be signed in to view this page" msgstr "Sie müssen sich anmelden um diese Seite aufzurufen" -#: kallithea/lib/base.py:493 +#: kallithea/lib/base.py:449 +msgid "Invalid API key" +msgstr "Ungültiger API Key" + +#: kallithea/lib/base.py:508 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "Das Repository konnte nicht im Filesystem gefunden werden" -#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:623 -msgid "Changeset not found" +#: kallithea/lib/base.py:617 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset for %s %s not found in %s" msgstr "Änderungssatz nicht gefunden" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "Binäre Datei" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Der Änderungssatz war zu groß und wurde abgeschnitten, benutzen sie das " "Diff Menü um die Unterschiede anzuzeigen" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "Keine Änderungen erkannt" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "Branch %s gelöscht" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "Tag %s erstellt" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:613 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset %s not found" +msgstr "Änderungssatz nicht gefunden" + +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Zeige alle Kombinierten Änderungensätze %s->%s" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 msgid "Compare view" msgstr "Vergleichsansicht" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "und" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "%s mehr" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "revisionen" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, python-format msgid "Fork name %s" msgstr "Fork Name %s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, python-format msgid "Pull request %s" msgstr "Pull Request %s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "[gelöscht] Repository" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 msgid "[created] repository" msgstr "[erstellt] Repository" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "[erstellt] Repository als Fork" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "[forked] Repository" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "[aktualisiert] Repository" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "Archiv von Repository [heruntergeladen]" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "Repository [gelöscht]" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "Benutzer [erstellt]" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "Benutzer [akutalisiert]" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "Benutzergruppe [erstellt]" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "Benutzergruppe [aktualisiert]" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "Revision [kommentiert] in Repository" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "Pull Request [kommentiert] für" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "Pull Request [geschlossen] für" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "[Pushed] in" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "[via Kallithea] in Repository [committed]" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "[Pulled von Remote] in Repository" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "[Pulled] von" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "[Following gestartet] für Repository" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "[Following gestoppt] für Repository" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr " und %s weitere" -#: kallithea/lib/helpers.py:1128 -#: kallithea/templates/compare/compare_diff.html:71 -#: kallithea/templates/pullrequests/pullrequest_show.html:337 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "Keine Dateien" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "neue Datei" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "entf" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "umbenennen" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1469 +#: kallithea/lib/helpers.py:1230 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1261,745 +1341,404 @@ "es im Dateisystem erstellt oder umbenannt. Bitte starten sie die " "Applikation erneut um die Repositories neu zu Indizieren" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d Jahr" msgstr[1] "%d Jahre" -#: kallithea/lib/utils2.py:435 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d Monat" msgstr[1] "%d Monate" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d Tag" msgstr[1] "%d Tage" -#: kallithea/lib/utils2.py:437 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: kallithea/lib/utils2.py:439 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d Sekunde" msgstr[1] "%d Sekunden" -#: kallithea/lib/utils2.py:455 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "in %s" -#: kallithea/lib/utils2.py:457 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "vor %s" -#: kallithea/lib/utils2.py:459 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "in %s und %s" -#: kallithea/lib/utils2.py:462 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "%s und %s her" -#: kallithea/lib/utils2.py:465 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "jetzt gerade" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "Kein Zugriff auf Repository" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "Lesender Zugriff auf Repository" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "Schreibdender Zugriff auf Repository" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "Administrativer Zugang zum Repository" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "Repository Gruppe hat Keinen Zugriff" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "Repository Gruppe hat lesenden Zugriff" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "Repository Gruppe hat schreibenden Zugriff" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "Repository Gruppe hat Administrativen Zugriff" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1669 +#: kallithea/model/comment.py:68 +#, python-format +msgid "on line %s" +msgstr "in Zeile %s" + +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +msgid "[Mention]" +msgstr "[Mention]" + +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "höchste Ebene" + +#: kallithea/model/db.py:1715 msgid "Kallithea Administrator" msgstr "Kallithea Administrator" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "Erstellung eines Repositorys deaktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "Erstellung eines Repositorys aktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "Forking eines Repositorys deaktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "Forking eines Repositorys aktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "Registrierung deaktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "Registrierung neuer Benutzer in Kallithea mit manueller Aktivierung" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "Registrierung neuer Benutzer in Kallithea mit Automatischer Aktivierung" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "Nicht Begutachtet" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2237 -msgid "Approved" -msgstr "Akzeptiert" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2238 -msgid "Rejected" -msgstr "Abgelehnt" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "In Begutachtung" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1518 -msgid "top level" -msgstr "höchste Ebene" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "Kein Zugriff für Repositorygruppe" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "Lesezugriff für Repositorygruppe" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "Schreibzugriff für Repositorygruppe" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "Administrativer Zugriff für Repositorygruppe" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "Kein Zugriff für Benutzergruppe" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "Lesezugriff für Benutzergruppe" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "Nutzergruppe Schreibzugriff" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "Administrativer Zugriff für Benutzergruppe" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "Erstellung von Repositorygruppen deaktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "Erstellung von Repositorygruppen aktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "Erstellung von Benutzergruppen deaktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "Erstellung von Benutzergruppen aktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1701 -msgid "Registration disabled" -msgstr "Registrierung deaktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "Benutzerregistrierung mit manueller Kontoaktivierung" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "Benutzerregistrierung mit automatische Kontoaktivierung" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1695 +#: kallithea/model/db.py:1717 +msgid "Default user has no access to new repositories" +msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Repositories" + +#: kallithea/model/db.py:1718 +msgid "Default user has read access to new repositories" +msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repositories" + +#: kallithea/model/db.py:1719 +msgid "Default user has write access to new repositories" +msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Repositories" + +#: kallithea/model/db.py:1720 +msgid "Default user has admin access to new repositories" +msgstr "Der Standard-Benutzer hat Admin-Rechte auf neuen Repositories" + +#: kallithea/model/db.py:1722 +msgid "Default user has no access to new repository groups" +msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Repository-Gruppen" + +#: kallithea/model/db.py:1723 +msgid "Default user has read access to new repository groups" +msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repository-Gruppen" + +#: kallithea/model/db.py:1724 +msgid "Default user has write access to new repository groups" +msgstr "Der Standard-Benutzer Schreibrechte auf neuen Repository-Gruppen" + +#: kallithea/model/db.py:1725 +msgid "Default user has admin access to new repository groups" +msgstr "Der Standard-Benutzer Admin-Rechte auf neuen Repository-Gruppen" + +#: kallithea/model/db.py:1727 +msgid "Default user has no access to new user groups" +msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Benutzer-Gruppen" + +#: kallithea/model/db.py:1728 +msgid "Default user has read access to new user groups" +msgstr "Der Standard-Benutzer hat Leserechte auf neuen Benutzer-Gruppen" + +#: kallithea/model/db.py:1729 +msgid "Default user has write access to new user groups" +msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Benutzer-Gruppen" + +#: kallithea/model/db.py:1730 +msgid "Default user has admin access to new user groups" +msgstr "Der Standard-Benutzer hat Admin-Rechte auf neuen Benutzer-Gruppen" + +#: kallithea/model/db.py:1732 +msgid "Only admins can create repository groups" +msgstr "Nur Admins können Repository-Gruppen erstellen" + +#: kallithea/model/db.py:1733 +msgid "Non-admins can create repository groups" +msgstr "Nicht-Admins können Repository-Gruppen erstellen" + +#: kallithea/model/db.py:1735 +msgid "Only admins can create user groups" +msgstr "Nur Admins können Benutzer-Gruppen erstellen" + +#: kallithea/model/db.py:1736 +msgid "Non-admins can create user groups" +msgstr "Nicht-Admins können Benutzer-Gruppen erstellen" + +#: kallithea/model/db.py:1738 +msgid "Only admins can create top level repositories" +msgstr "Nur Admins können Repositories auf oberster Ebene erstellen" + +#: kallithea/model/db.py:1739 +msgid "Non-admins can create top level repositories" +msgstr "Nicht-Admins können Repositories oberster Ebene erstellen" + +#: kallithea/model/db.py:1741 msgid "Repository creation enabled with write permission to a repository group" msgstr "" "Erstellung von Repositories mit Schreibzugriff für Repositorygruppe " "aktiviert" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1696 +#: kallithea/model/db.py:1742 msgid "Repository creation disabled with write permission to a repository group" msgstr "" "Erstellung von Repositories mit Schreibzugriff für Repositorygruppe " "deaktiviert" -#: kallithea/model/comment.py:72 -#, python-format -msgid "on line %s" -msgstr "in Zeile %s" - -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 -msgid "[Mention]" -msgstr "[Mention]" - -#: kallithea/model/db.py:1671 -msgid "Default user has no access to new repositories" -msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Repositories" - -#: kallithea/model/db.py:1672 -msgid "Default user has read access to new repositories" -msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repositories" - -#: kallithea/model/db.py:1673 -msgid "Default user has write access to new repositories" -msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Repositories" - -#: kallithea/model/db.py:1674 -msgid "Default user has admin access to new repositories" -msgstr "Der Standard-Benutzer hat Admin-Rechte auf neuen Repositories" - -#: kallithea/model/db.py:1676 -msgid "Default user has no access to new repository groups" -msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Repository-Gruppen" - -#: kallithea/model/db.py:1677 -msgid "Default user has read access to new repository groups" -msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repository-Gruppen" - -#: kallithea/model/db.py:1678 -msgid "Default user has write access to new repository groups" -msgstr "Der Standard-Benutzer Schreibrechte auf neuen Repository-Gruppen" - -#: kallithea/model/db.py:1679 -msgid "Default user has admin access to new repository groups" -msgstr "Der Standard-Benutzer Admin-Rechte auf neuen Repository-Gruppen" - -#: kallithea/model/db.py:1681 -msgid "Default user has no access to new user groups" -msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Benutzer-Gruppen" - -#: kallithea/model/db.py:1682 -msgid "Default user has read access to new user groups" -msgstr "Der Standard-Benutzer hat Leserechte auf neuen Benutzer-Gruppen" - -#: kallithea/model/db.py:1683 -msgid "Default user has write access to new user groups" -msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Benutzer-Gruppen" - -#: kallithea/model/db.py:1684 -msgid "Default user has admin access to new user groups" -msgstr "Der Standard-Benutzer hat Admin-Rechte auf neuen Benutzer-Gruppen" - -#: kallithea/model/db.py:1686 -msgid "Only admins can create repository groups" -msgstr "Nur Admins können Repository-Gruppen erstellen" - -#: kallithea/model/db.py:1687 -msgid "Non-admins can create repository groups" -msgstr "Nicht-Admins können Repository-Gruppen erstellen" - -#: kallithea/model/db.py:1689 -msgid "Only admins can create user groups" -msgstr "Nur Admins können Benutzer-Gruppen erstellen" - -#: kallithea/model/db.py:1690 -msgid "Non-admins can create user groups" -msgstr "Nicht-Admins können Benutzer-Gruppen erstellen" - -#: kallithea/model/db.py:1692 -msgid "Only admins can create top level repositories" -msgstr "Nur Admins können Repositories auf oberster Ebene erstellen" - -#: kallithea/model/db.py:1693 -msgid "Non-admins can create top level repositories" -msgstr "Nicht-Admins können Repositories oberster Ebene erstellen" - -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1744 msgid "Only admins can fork repositories" msgstr "Nur Admins können Repositories forken" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1745 msgid "Non-admins can fork repositories" msgstr "Nicht-Admins können Repositorys forken" -#: kallithea/model/db.py:1702 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "Registrierung deaktiviert" + +#: kallithea/model/db.py:1748 msgid "User registration with manual account activation" msgstr "Benutzerregistrierung mit manueller Kontoaktivierung" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1749 msgid "User registration with automatic account activation" msgstr "Benutzerregistrierung mit automatischer Kontoaktivierung" -#: kallithea/model/db.py:2236 +#: kallithea/model/db.py:2276 msgid "Not reviewed" msgstr "Nicht Begutachtet" -#: kallithea/model/db.py:2239 +#: kallithea/model/db.py:2277 msgid "Under review" msgstr "In Begutachtung" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2278 +#, fuzzy +#| msgid "Approved" +msgid "Not approved" +msgstr "Akzeptiert" + +#: kallithea/model/db.py:2279 +msgid "Approved" +msgstr "Akzeptiert" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "Bitte einen Benutzernamen eingeben" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Bitte einen Wert mit mindestens %(min)i Zeichen eingeben" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "Bitte ein Passwort eingeben" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "Bitte mindestens %(min)i Zeichen eingeben" -#: kallithea/model/forms.py:165 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "Name darf nicht nur Ziffern enthalten" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:240 #, fuzzy, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s hat am %(when)s ein Changeset kommentiert" -#: kallithea/model/notification.py:255 +#: kallithea/model/notification.py:241 #, fuzzy, python-format msgid "%(user)s sent message %(age)s" msgstr "%(user)s hat am %(when)s eine Nachricht gesendet" -#: kallithea/model/notification.py:256 +#: kallithea/model/notification.py:242 #, fuzzy, python-format msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s hat Sie am %(when)s erwähnt" -#: kallithea/model/notification.py:257 +#: kallithea/model/notification.py:243 #, fuzzy, python-format msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s hat sich am %(when)s bei Kallithea registriert" -#: kallithea/model/notification.py:258 +#: kallithea/model/notification.py:244 #, fuzzy, python-format msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s hat am %(when)s einen neuen Pull Request eröffnet" -#: kallithea/model/notification.py:259 +#: kallithea/model/notification.py:245 #, fuzzy, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s hat am %(when)s einen Pull Request kommentiert" -#: kallithea/model/notification.py:266 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s hat am %(when)s ein Changeset kommentiert" -#: kallithea/model/notification.py:267 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s hat am %(when)s eine Nachricht gesendet" -#: kallithea/model/notification.py:268 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s hat Sie am %(when)s erwähnt" -#: kallithea/model/notification.py:269 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s hat sich am %(when)s bei Kallithea registriert" -#: kallithea/model/notification.py:270 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s hat am %(when)s einen neuen Pull Request eröffnet" -#: kallithea/model/notification.py:271 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s hat am %(when)s einen Pull Request kommentiert" -#: kallithea/model/notification.py:302 +#: kallithea/model/notification.py:288 #, fuzzy, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +#| msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" msgstr "" "Kommentar für %(repo_name)s Changeset %(short_id)s in %(branch)s erstellt" " von %(comment_username)s" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:291 #, python-format msgid "New user %(new_username)s registered" msgstr "Neuer Benutzer %(new_username)s registriert" +#: kallithea/model/notification.py:293 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:307 -#, fuzzy, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" -"Review Request für %(repo_name)s Pull Request #%(pr_id)s von %(ref)s " -"erstellt von %(pr_username)s" - -#: kallithea/model/notification.py:308 -#, fuzzy, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" -"Kommentar von %(comment_username)s für %(repo_name)s Pull Request " -"#%(pr_id)s von %(ref)s" - -#: kallithea/model/notification.py:321 msgid "Closing" msgstr "Schließen" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, fuzzy, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "%(user)s möchte ein Review des Pull Request #%(pr_id)s: %(pr_title)s" -#: kallithea/model/scm.py:708 +#: kallithea/model/pull_request.py:211 +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Cannot create empty pull request" +msgstr "Fehler beim Erstellen des Pull-Requests: %s" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +#, fuzzy +#| msgid "Missing changesets since the previous pull request:" +msgid "Missing changesets since the previous iteration:" +msgstr "Fehlende Changesets seit letztem Pull Request:" + +#: kallithea/model/pull_request.py:348 +#, fuzzy, python-format +#| msgid "New changesets on %s %s since the previous pull request:" +msgid "New changesets on %s %s since the previous iteration:" +msgstr "Neue Changesets in %s %s seit dem letzten Pull Request:" + +#: kallithea/model/pull_request.py:355 +#, fuzzy +#| msgid "Ancestor didn't change - show diff since previous version:" +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "Vorgänger unverändert - zeige Diff zu lezter Version:" + +#: kallithea/model/pull_request.py:362 +#, fuzzy, python-format +#| msgid "" "This pull request is based on another %s revision and there is no +#| simple " "diff." +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" +"Dieser Pull Request basiert auf einer anderen %s Revision. Daher ist kein" +" Simple Diff verfügbar." + +#: kallithea/model/pull_request.py:364 +#, fuzzy, python-format +#| msgid "No changes found on %s %s since previous version." +msgid "No changes found on %s %s since previous iteration." +msgstr "Keine Änderungen seit der letzten Version gefunden in %s %s." + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "Letzter Tip" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "Neue Benutzerregistrierung" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 #, fuzzy msgid "You can't remove this user since it is crucial for the entire application" msgstr "" "Sie können diesen Benutzer nicht löschen, da er von entscheidender " "Bedeutung für die gesamte Applikation ist" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -2009,7 +1748,7 @@ "nicht entfernt werden. Entweder muss der Besitzer geändert oder das " "Repository entfernt werden: %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" @@ -2019,7 +1758,7 @@ "kann daher nicht entfernt werden. Entweder muss der Besitzer geändert " "oder die Repositorygruppen müssen entfernt werden: %s" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -2029,37 +1768,37 @@ "nicht entfernt werden. Entweder muss der Besitzer geändert oder die " "Benutzergruppen müssen gelöscht werden: %s" -#: kallithea/model/user.py:368 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "Link zum Zurücksetzen des Passworts" -#: kallithea/model/user.py:418 +#: kallithea/model/user.py:413 #, fuzzy msgid "Password reset notification" msgstr "Link zum Zurücksetzen des Passworts" -#: kallithea/model/user.py:419 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "Eine leere Liste ist kein gültiger Wert" -#: kallithea/model/validators.py:96 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Benutezrname \"%(username)s\" existiert bereits" -#: kallithea/model/validators.py:98 +#: kallithea/model/validators.py:75 #, fuzzy, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Benutzername \"%(username)s\" ist ungültig" -#: kallithea/model/validators.py:100 +#: kallithea/model/validators.py:77 #, fuzzy msgid "" "Username may only contain alphanumeric characters underscores, periods or" @@ -2069,25 +1808,25 @@ "oder Bindestriche enthalten und muss mit einem alphanumerischen Zeichen " "oder einem Unterstrich beginnen" -#: kallithea/model/validators.py:127 +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "Die Eingabe ist nicht gültig" -#: kallithea/model/validators.py:134 +#: kallithea/model/validators.py:111 #, python-format msgid "Username %(username)s is not valid" msgstr "Benutzername \"%(username)s\" ist ungültig" -#: kallithea/model/validators.py:154 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "Ungültiger Benutzergruppenname" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:132 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Benutzergruppe \"%(usergroup)s\" existiert bereits" -#: kallithea/model/validators.py:157 +#: kallithea/model/validators.py:134 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -2096,110 +1835,110 @@ "Unterstriche, Punkte oder Bindestriche enthalten und muss mit einem " "alphanumerischen Zeichen beginnen" -#: kallithea/model/validators.py:197 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "Kann diese Gruppe nicht als vorgesetzt setzen" -#: kallithea/model/validators.py:198 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Gruppe \"%(group_name)s\" existiert bereits" -#: kallithea/model/validators.py:200 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Es gibt bereits ein Repository mit \"%(group_name)s\"" -#: kallithea/model/validators.py:258 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "Üngültige(nicht ASCII) Zeichen im Passwort" -#: kallithea/model/validators.py:273 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "Ungültiges altes Passwort" -#: kallithea/model/validators.py:289 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "Die Passwörter stimmen nicht überein" -#: kallithea/model/validators.py:304 +#: kallithea/model/validators.py:279 #, fuzzy msgid "Invalid username or password" msgstr "Ungültiges Passwort" -#: kallithea/model/validators.py:335 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "Schlüssel stimmt nicht überein" -#: kallithea/model/validators.py:351 +#: kallithea/model/validators.py:326 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "Repository Name \"%(repo)s\" ist nicht erlaubt" -#: kallithea/model/validators.py:353 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Es gibt bereits ein Repository mit \"%(repo)s\"" -#: kallithea/model/validators.py:354 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" "Es gibt bereits ein Repository mit \"%(repo)s\" in der Gruppe " "\"%(group)s\"" -#: kallithea/model/validators.py:356 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Eine Repositorygruppe mit dem Namen \"%(repo)s\" existiert bereits" -#: kallithea/model/validators.py:470 +#: kallithea/model/validators.py:449 msgid "Invalid repository URL" msgstr "Ungültige Repository-URL" -#: kallithea/model/validators.py:471 +#: kallithea/model/validators.py:450 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:496 +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "Forke um den selben typ wie der Vorgesetze zu haben" -#: kallithea/model/validators.py:511 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "" "Du hast nicht die erforderlichen Berechtigungen, um in dieser Gruppe ein " "Repository zu erzeugen" -#: kallithea/model/validators.py:513 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "keine Berechtigung, um ein Repository auf höchster Ebene anzulegen" -#: kallithea/model/validators.py:563 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "Sie haben keine Berechtigung, um an diesem Ort ein Repository anzulegen" -#: kallithea/model/validators.py:604 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "Dieser Benutzername oder Benutzergruppenname ist nicht gültig" -#: kallithea/model/validators.py:697 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "Dies ist ein Ungültiger Pfad" -#: kallithea/model/validators.py:714 +#: kallithea/model/validators.py:692 #, fuzzy msgid "This email address is already in use" msgstr "Diese E-Mailaddresse ist bereits in Benutzung" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:712 #, fuzzy, python-format msgid "Email address \"%(email)s\" not found" msgstr "E-MailAddresse \"%(email)s\" existiert nicht." -#: kallithea/model/validators.py:771 +#: kallithea/model/validators.py:749 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -2207,287 +1946,274 @@ "Das LDAP-Login-Attribut des CN muss angeben werden - Es ist der Name des " "Attributes äquivalent zu \"Benutzername\"" -#: kallithea/model/validators.py:783 +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Bitte eine gültige IPv4- oder IPv6-Adresse angeben" -#: kallithea/model/validators.py:784 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" "Die Größe (in Bits) des Netzwerks muss im Bereich 0-32 liegen (nicht " "%(bits)r)" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" "Der Name eines Schlüssels darf nur aus Buchstaben, Ziffern, Unterstrich " "und Bindestrich bestehen" -#: kallithea/model/validators.py:831 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "Dateiname darf kein Unterverzeichnis enthalten" -#: kallithea/model/validators.py:847 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" "Die Plug-Ins %(loaded)s und %(next_to_load)s exportieren beide den selben" " Namen" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "Über" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "Übersichtsseite" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "Schnellfilter..." - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "Repositories" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "Repository hinzufügen" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "Repositorygruppe hinzufügen" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "Du hast Adminrechte für diese Gruppe und kannst sie editieren" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "Repositorygruppe bearbeiten" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "Gruppenname" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +#, fuzzy +#| msgid "Repository group" +msgid "Repository Group" +msgstr "Repository Gruppe" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "Beschreibung" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "Name" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "Repository" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "Letzte Änderung" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" msgstr "Tipp" -#: kallithea/templates/index_base.html:132 +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:244 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "Besitzer" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "Klicken um Aufsteigend zu Sortieren" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "Klicken um Absteigend zu Sortieren" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "Keine Repositories gefunden." - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "Datenfehler." - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "Lade..." - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:414 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "Log In" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "Log In in %s" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "Benutzername" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "Passwort" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "Login Speichern" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "Passowrt Vergessen?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "Kein Account?" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "Einloggen" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "Passwort zurücksetzen" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 #, python-format msgid "Reset Your Password to %s" msgstr "Setze dein Passwort auf %s zurück" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 msgid "Reset Your Password" msgstr "Setze dein Passwort zurück" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "E-Mailadresse" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "Captcha" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 msgid "Send Password Reset Email" msgstr "E-Mail zum Zurücksetzen des Passworts anfordern" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 #, fuzzy msgid "" "A password reset link will be sent to the specified email address if it " @@ -2496,115 +2222,138 @@ "Der Link zum Zurücksetzen des Passworts wird an die zum Benutzernamen " "zugehörige E-Mailaddresse gesendet." -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 #, fuzzy msgid "New Password" msgstr "Neues Passwort" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 #, fuzzy msgid "Confirm New Password" msgstr "Bestätige neues Passwort" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "Bestätigen" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "Registrieren" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "Registrieren für %s" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "Passwort erneut eingeben" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "Vorname" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "Nachname" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "E-Mail" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "Registrierte Konten können ohne weitere Aktion genutzt werden." -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "" "Bitte warten Sie auf die Aktivierung Ihres Benutzerkontos durch einen " "Administrator." -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "Es gibt bisher keine Branches" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "Es gibt bisher keine Tags" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "Es gibt bisher keine Lesezeichen" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 msgid "Admin Journal" msgstr "Admin-Logbuch" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "Logbuch filter..." #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 msgid "Filter" msgstr "Filter" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2612,59 +2361,60 @@ msgstr[1] "%s Einträge" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "Aktion" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "Repository" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "Datum" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "Von IP" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "Es sind bisher keine Aktionen passiert" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "Authentifizierungseinstellungen" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "Authentifizierung" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "Plug-Ins zur Authentifizierung" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "Aktivierte Plugins" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 #, fuzzy msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " @@ -2674,57 +2424,78 @@ "der Reihenfolge, in der Kallithea die Plug-Ins zur Authentifizierung des " "Benutzers verwendet" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "Verfügbare mitgelieferte Plug-Ins" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "Plugin" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "Speichern" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 msgid "Repository Defaults" msgstr "Repositorystandards" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "Typ" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 msgid "Private repository" msgstr "Privates Repository" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -2732,34 +2503,40 @@ "Private Repositories sind nur für explizit hinzugefügte Mitarbeiter " "sichtbar." -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 msgid "Enable statistics" msgstr "Aktiviere Statistiken" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 msgid "Enable statistics window on summary page." msgstr "Statistik-Fenster in der Zusammenfassungsseite aktivieren." -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 msgid "Enable downloads" msgstr "Aktiviere Downloads" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 msgid "Enable download menu on summary page." msgstr "Download-Menü auf der Zusammenfassungsseite aktivieren." -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 msgid "Enable locking" msgstr "Locking aktivieren" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2768,7 +2545,7 @@ msgid "Edit Gist" msgstr "Gist editieren" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " @@ -2777,318 +2554,473 @@ "Gist wurde während der Änderung aktualisiert. Änderungen kopieren und " "%(here)s klicken um die neue Version nachzuladen." -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "Gist Beschreibung ..." -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "Gist Lebenszeit" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" msgstr "Verfällt" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 #, fuzzy msgid "Never" msgstr "nie" -#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "Gist aktualisieren" -#: kallithea/templates/admin/gists/edit.html:147 -#: kallithea/templates/changeset/changeset_file_comment.html:105 +#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "Abbrechen" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, python-format msgid "Private Gists for User %s" msgstr "Privater Gist für Benutzer %s" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, python-format msgid "Public Gists for User %s" msgstr "Öffentlicher Gist für Benutzer %s" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "Öffentliche Gists" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "Neuen Gist erstellen" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "Erstellt" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "Bisher sind keine Gists vorhanden" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "Neuer Gist" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." +#: kallithea/templates/admin/gists/new.html:45 +#, fuzzy +#| msgid "name this file..." +msgid "Name this gist ..." msgstr "benenne diese Datei..." -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "Privaten Gist erstellen" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "Öffentlichen Gist erstellen" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "Zurücksetzen" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "Gist" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "URL" -#: kallithea/templates/admin/gists/show.html:37 +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 msgid "Public Gist" msgstr "Öffentlicher Gist" -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/templates/admin/gists/show.html:37 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "Privater Gist" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:31 -#: kallithea/templates/changeset/changeset_file_comment.html:95 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "Löschen" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "Löschen des Gists bestätigen" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "Bearbeiten" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "Bearbeiten" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "erstellt" -#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:431 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "Mein Account" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "Profil" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 #, fuzzy msgid "Email Addresses" msgstr "Neue E-Mailadresse" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "API Keys" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 #, fuzzy msgid "Owned Repositories" msgstr "Repositories" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 #, fuzzy msgid "Watched Repositories" msgstr "Repositories" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 #, fuzzy msgid "Show Permissions" msgstr "Berechtigungen kopieren" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "Mitgeliefert" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, fuzzy, python-format msgid "Confirm to reset this API key: %s" msgstr "Zurücksetzen des API Keys \"%s\" bestätigen" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 #, fuzzy msgid "Expired" msgstr "verfallen" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, fuzzy, python-format msgid "Confirm to remove this API key: %s" msgstr "Entfernen des API Keys \"%s\" bestätigen" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 #, fuzzy msgid "Remove" msgstr "entfernen" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 #, fuzzy msgid "No additional API keys specified" msgstr "Keine weiteren API Keys spezifiziert" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 #, fuzzy msgid "New API key" msgstr "Neuer API Key" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "Hinzufügen" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "Primär" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "Löschen der E-Mail \"%s\" bestätigen" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 msgid "No additional emails specified." msgstr "Keine weiteren E-Mails spezifiziert." -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "Neue E-Mailadresse" @@ -3096,124 +3028,166 @@ msgid "Change Your Account Password" msgstr "Passwort des Benutzerkontos ändern" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "Aktuelles Passwort" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "Neues Passwort" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "Bestätige neues Passwort" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +#, fuzzy +msgid "Current IP" +msgstr "Aktuelle IP-Adresse" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, fuzzy, python-format +#| msgid "Change your avatar at" +msgid "Change %s avatar at" msgstr "Benutzerbild ändern unter" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "Avatare sind deaktiviert" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "E-Mailadresse fehlt, bitte aktualisieren." - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -#, fuzzy -msgid "Current IP" -msgstr "Aktuelle IP-Adresse" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 msgid "Repositories You Own" msgstr "Repositories in Ihrem Besitz" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "Keine Datensätze gefunden." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" +msgstr "Name" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 msgid "Repositories You are Watching" msgstr "Repositories, denen Sie folgen" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "Meine Benachrichtigungen" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "Alle" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "Kommentare" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "Pull Requests" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 msgid "Mark All Read" msgstr "Markiere alle als gelesen" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +#, fuzzy +#| msgid "Mark All Read" +msgid "Mark as read" +msgstr "Markiere alle als gelesen" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "Bisher gibt es keine Benachrichtigungen" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 msgid "Show Notification" msgstr "Zeige Benachrichtigung" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:430 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "Benachrichtigungen" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 msgid "Default Permissions" msgstr "Standardrechte" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "Global" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "IP Whitelist" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "Anonymer Zugang" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " @@ -3222,7 +3196,8 @@ "Unauthentifizierten Zugriff auf Kallithea erlauben. Anonyme Benutzer " "verwenden %s Benutzerrechte." -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " @@ -3232,24 +3207,30 @@ "gesetzt. Beachten Sie, dass alle spezifischen Standardrechte der " "Repositories verloren gehen" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 #, fuzzy msgid "Apply to all existing repositories" msgstr "Bestehendes Repository importieren?" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 msgid "Permissions for the Default user on new repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 msgid "Repository group" msgstr "Repository Gruppe" -#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " @@ -3259,22 +3240,27 @@ "Rechte gesetzt. Beachten Sie, dass all spezifischen Standardrechte der " "Repositorygruppen verloren gehen" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 #, fuzzy msgid "Apply to all existing repository groups" msgstr "Bestehendes Repository importieren?" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 #, fuzzy msgid "Permissions for the Default user on new repository groups." msgstr "Rechte der übergeordneten Repositorygruppe kopieren." -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "Benutzergruppe" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 #, fuzzy msgid "" "All default permissions on each user group will be reset to chosen " @@ -3285,34 +3271,41 @@ "gesetzt. Beachten Sie, dass alle spezifischen Standardrechte der " "Benutzergruppen verloren gehen" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "Auf alle bestehenden Benutzergruppen anwenden" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 #, fuzzy msgid "Top level repository creation" msgstr "Repository erstellung" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 msgid "Enable this to allow non-admins to create repositories at the top level." msgstr "Aktiviere dies, um Nicht-Admins" -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 #, fuzzy msgid "" "With this, write permission to a repository group allows creating " @@ -3322,73 +3315,95 @@ "Schreibrechte einer Repository Gruppe erlauben innerhalb der Gruppe neue " "Repositorys zu erstellen." -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 msgid "User group creation" msgstr "Benutzergruppen Erstellung" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "Registrierung" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, fuzzy, python-format msgid "Confirm to delete this IP address: %s" msgstr "Bestätigen diese IP zu löschen: %s" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 msgid "All IP addresses are allowed." msgstr "Alle IP-Adressen sind zulässig." -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "Neue IP-Adresse" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "Repositorygruppen" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "Gruppen name" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "Übergeordnete Gruppe" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "Rechte der übergeordneten Gruppe kopieren" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "Rechte der übergeordneten Repositorygruppe kopieren." @@ -3397,31 +3412,42 @@ msgid "%s Repository Group Settings" msgstr "%s Einstellungen für Repositorygruppen" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "Untergruppe hinzufügen" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "Einstellungen" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "Erweitert" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "Rechte" @@ -3445,12 +3471,14 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "Erstellt am" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3461,8 +3489,30 @@ msgid "Delete this repository group" msgstr "Diese Repositorygruppe löschen" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "disabled" +msgid "Visible" +msgstr "Deaktiviert" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "Add Repository" +msgid "Add repos" +msgstr "Repository hinzufügen" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#, fuzzy +#| msgid "Add user group" +msgid "Add/Edit groups" +msgstr "Benutzergruppe hinzufügen" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 #, fuzzy msgid "User/User Group" @@ -3470,8 +3520,8 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy @@ -3480,105 +3530,117 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy msgid "Revoke" msgstr "entziehen" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "Beide" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "Diese Gruppe löschen" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "Löschen der Gruppe bestätigen" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" +#, fuzzy, python-format +#| msgid "Repository Group: %s" +msgid "Repository group %s" +msgstr "Repositorygruppe: %s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "mit" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 msgid "Repository Groups Administration" msgstr "Repositorygruppenverwaltung" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 msgid "Number of Top-level Repositories" msgstr "Anzahl der Repositories oberster Ebene" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 #, fuzzy msgid "Clone remote repository" msgstr "[erstellt] Repository" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Halten Sie es kurz und prägnant. Benutzen Sie eine README-Datei für " "längere Beschreibungen." -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "Repository Typ der erstellt werden soll." -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "Start Revision" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3607,56 +3669,69 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, python-format msgid "%s Repository Settings" msgstr "%s Repositoryeinstellungen" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "Entfernt" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "Statistiken" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 msgid "Parent" msgstr "Übergeordnet" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 msgid "Public Journal Visibility" msgstr "Sichtbarkeit des öffentlichen Logbuches" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "Entferne aus dem Öffentlichen Logbuch" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 msgid "Add to Public Journal" msgstr "Zum öffentlichen Logbuch hinzufügen" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." @@ -3664,36 +3739,44 @@ "Alle Aktionen, die in diesem Repository ausgeführt wurden, sind im " "öffentlichen Logbuch für jeden einsehbar." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 msgid "Change Locking" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 msgid "Confirm to unlock repository." msgstr "Entsperren des Repositorys bestätigen." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 msgid "Unlock Repository" msgstr "Repository entsperren" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 #, python-format msgid "Locked by %s on %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 msgid "Confirm to lock repository." msgstr "Sperren des Repositorys bestätigen." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 msgid "Lock Repository" msgstr "Repository sperren" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "Repository ist nicht gesperrt" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3701,32 +3784,39 @@ "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Löschen des Repositorys bestätigen: %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 msgid "Delete this Repository" msgstr "Dieses Repository löschen" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "Dieses Repository hat %s Fork" msgstr[1] "Dieses Repository hat %s Forks" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "Fork abtrennen" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "Forks löschen" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3737,106 +3827,116 @@ msgid "Invalidate Repository Cache" msgstr "Ungültiger Repositorycache" -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "Präfix" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "Schlüssel" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "Aktiv" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "Löschen des Felds bestätigen: %s" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "Zusatzfelder sind deaktiviert." -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "privates Repository" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "[forked] repository" +msgid "Fork of repository" +msgstr "[forked] Repository" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "Repositorium erzeugt %s" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 #, fuzzy msgid "Pull Changes from Remote Repository" msgstr "[Pulled von Remote] in Repository" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 -#, fuzzy -msgid "Confirm to pull changes from remote repository." -msgstr "[Pulled von Remote] in Repository" - #: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#, fuzzy +msgid "Confirm to pull changes from remote repository." +msgstr "[Pulled von Remote] in Repository" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 #, fuzzy msgid "Permanent Repository ID" msgstr "privates Repository" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3846,35 +3946,35 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "[erstellt] Repository" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 #, fuzzy msgid "Repository URL" msgstr "Repository" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "Besitzer des Repositorys ändern." -#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 msgid "Processed commits" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 msgid "Processed progress" msgstr "" @@ -3887,315 +3987,376 @@ msgstr "" #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 msgid "Repositories Administration" msgstr "Repositoryverwaltung" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 msgid "Settings Administration" msgstr "Einstellungsverwaltung" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "VCS" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "Hooks" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "Volltextsuche" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "Systeminfo" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "Senden" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems like Google" +" Analytics or Piwik, but also to perform " +"instance-specific customizations like adding a " +"project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 msgid "Save Settings" msgstr "Einstellungen speichern" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Description" +msgid "Rescan options" +msgstr "Beschreibung" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 msgid "" "Check this option to remove all comments, pull requests and other records" " related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 +msgid "Install Git hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 +#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " "not seem to come from Kallithea. WARNING: This operation will destroy any" " custom git hooks you may have deployed by hand!" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/templates/admin/settings/settings_mapping.html:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "Erneut Indizieren" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." +msgstr "Prüfe auf Updates..." + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 #, fuzzy msgid "Check for updates" msgstr "Auf Updates prüfen" -#: kallithea/templates/admin/settings/settings_system.html:5 +#: kallithea/templates/admin/settings/settings_system.html:8 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 msgid "Kallithea configuration file" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:6 +#: kallithea/templates/admin/settings/settings_system.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 msgid "Python version" msgstr "Python-Version" -#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 msgid "Platform" msgstr "Plattform" -#: kallithea/templates/admin/settings/settings_system.html:8 +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 msgid "Git version" msgstr "Git-Version" -#: kallithea/templates/admin/settings/settings_system.html:9 +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "" "Hinweis: Bitte stellen Sie sicher, dass der Server auf die URL zugreifen " "kann" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "Prüfe auf Updates..." - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "Web" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 msgid "Mercurial extensions" msgstr "Mercurial-Erweiterungen" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 msgid "Enable largefiles extension" msgstr "Erweiterung largefiles aktivieren" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 msgid "Enable hgsubversion extension" msgstr "Erweiterung hgsubversion aktivieren" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 msgid "Location of repositories" msgstr "Ort der Repositories" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting" " take effect." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "Allgemein" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "Zeige Kallithea-Version" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4212,102 +4373,126 @@ "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +msgid "Clone URL" +msgstr "Clone-URL" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." "\n" -" The following " +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user" +" username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repository Size" +msgid "Repository page size" +msgstr "Repository Größe" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 msgid "Icons" msgstr "Icons" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 #, fuzzy msgid "Meta Tagging" msgstr "Einstellungen" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "Benutzergruppe hinzufügen" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "Benutzergruppen" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "Benutzergruppe hinzufügen" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "Kurze, optionale Beschreibung für diese Benutzergruppe." #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 #, fuzzy msgid "Show Members" msgstr "mitglieder" @@ -4318,13 +4503,15 @@ msgstr "Benutzergruppe: %s" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "Mitglieder" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4333,48 +4520,59 @@ msgid "Delete this user group" msgstr "Diese Benutzergruppe löschen" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "Noch keine Mitglieder" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "Ausgewählte Grppenmitglieder" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "Verfügbare Mitglieder" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 msgid "User Groups Administration" msgstr "Benutzergruppenverwaltung" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "Benutzer hinzufügen" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "Benutzer" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "Benutzer hinzufügen" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "" @@ -4384,12 +4582,14 @@ msgstr "Benutzer: %s" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "Letzter Login" @@ -4398,7 +4598,8 @@ msgstr "Mitglieder der Benutzergruppe" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4407,726 +4608,892 @@ msgid "Delete this user" msgstr "Diesen Benutzer löschen" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 msgid "Users Administration" msgstr "Benutzerverwaltung" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "Authentifizierungsart" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "Support" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "Mercurial Repository" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "Git Repository" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 msgid "Create Fork" msgstr "Fork erstellen" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "Zusammenfassung" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "Dateien" -#: kallithea/templates/base/base.html:142 -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 msgid "Options" msgstr "Optionen" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:147 +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 msgid "Compare Fork" msgstr "Fork vergleichen" -#: kallithea/templates/base/base.html:154 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:331 +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:155 +#: kallithea/tests/data/templates/base/base.html.py:399 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:157 +#: kallithea/tests/data/templates/base/base.html.py:405 msgid "Lock" msgstr "" +#: kallithea/templates/base/base.html:165 +#: kallithea/tests/data/templates/base/base.html.py:413 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 +msgid "Fork" +msgstr "" + #: kallithea/templates/base/base.html:170 -msgid "Follow" -msgstr "" - -#: kallithea/templates/base/base.html:171 -msgid "Unfollow" -msgstr "" - -#: kallithea/templates/base/base.html:174 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 +msgid "Create Pull Request" msgstr "" #: kallithea/templates/base/base.html:175 -#: kallithea/templates/pullrequests/pullrequest.html:88 -msgid "Create Pull Request" -msgstr "" - -#: kallithea/templates/base/base.html:180 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:485 +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 msgid "No matches found" msgstr "Keine Übereinstimmungen gefunden" -#: kallithea/templates/base/base.html:305 +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "" +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 +msgid "Public journal" +msgstr "Öffentliches Logbuch" + +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 +msgid "Gists" +msgstr "" + #: kallithea/templates/base/base.html:311 -#: kallithea/templates/base/base.html:312 -msgid "Public journal" -msgstr "Öffentliches Logbuch" - -#: kallithea/templates/base/base.html:317 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:318 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:322 +#: kallithea/tests/data/templates/base/base.html.py:525 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:330 +#: kallithea/templates/base/base.html:319 +#: kallithea/tests/data/templates/base/base.html.py:540 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:353 -#: kallithea/templates/base/base.html:354 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 msgid "My Pull Requests" msgstr "Meine Pull Requests" -#: kallithea/templates/base/base.html:377 +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 msgid "Not Logged In" msgstr "Nicht eingeloggt" -#: kallithea/templates/base/base.html:384 +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 msgid "Login to Your Account" msgstr "" +#: kallithea/templates/base/base.html:385 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" +msgstr "Passwort vergessen?" + +#: kallithea/templates/base/base.html:389 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "Kein Account?" + #: kallithea/templates/base/base.html:407 -msgid "Forgot password ?" -msgstr "Passwort vergessen?" - -#: kallithea/templates/base/base.html:434 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:615 -msgid "Keyboard shortcuts" -msgstr "" - -#: kallithea/templates/base/base.html:624 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 #, fuzzy msgid "Inherit defaults" msgstr "Repositorystandards" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "Rechte" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "Berechtigungen editieren" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -msgid "Add Another Comment" -msgstr "Einen weiteren Kommentar hinzufügen" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - #: kallithea/templates/base/root.html:25 -msgid "Group" -msgstr "Gruppe" +#: kallithea/tests/data/templates/base/root.html.py:85 +msgid "Add Another Comment" +msgstr "Einen weiteren Kommentar hinzufügen" #: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "mitglieder" +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 +msgid "Stop following this repository" +msgstr "" #: kallithea/templates/base/root.html:27 -msgid "Loading ..." +#: kallithea/tests/data/templates/base/root.html.py:89 +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:28 -msgid "loading ..." -msgstr "" +#: kallithea/tests/data/templates/base/root.html.py:91 +msgid "Group" +msgstr "Gruppe" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" -msgstr "" +#: kallithea/tests/data/templates/base/root.html.py:93 +msgid "members" +msgstr "mitglieder" #: kallithea/templates/base/root.html:30 -msgid "No matching files" +#: kallithea/tests/data/templates/base/root.html.py:95 +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:31 +#: kallithea/tests/data/templates/base/root.html.py:97 +msgid "loading ..." +msgstr "" + +#: kallithea/templates/base/root.html:32 +#: kallithea/tests/data/templates/base/root.html.py:99 +msgid "Search truncated" +msgstr "" + +#: kallithea/templates/base/root.html:33 +#: kallithea/tests/data/templates/base/root.html.py:101 +msgid "No matching files" +msgstr "" + +#: kallithea/templates/base/root.html:34 +#: kallithea/tests/data/templates/base/root.html.py:103 #, fuzzy msgid "Open New Pull Request from {0}" msgstr "Kommentar von Pull Request" -#: kallithea/templates/base/root.html:32 +#: kallithea/templates/base/root.html:35 +#: kallithea/tests/data/templates/base/root.html.py:105 msgid "Open New Pull Request for {0} → {1}" msgstr "" -#: kallithea/templates/base/root.html:33 +#: kallithea/templates/base/root.html:36 +#: kallithea/tests/data/templates/base/root.html.py:107 #, fuzzy msgid "Show Selected Changesets {0} → {1}" msgstr "Ausgewähltes Changeset anzeigen __S" -#: kallithea/templates/base/root.html:34 +#: kallithea/templates/base/root.html:37 +#: kallithea/tests/data/templates/base/root.html.py:109 msgid "Selection Link" msgstr "" -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -#: kallithea/templates/changeset/diff_block.html:21 -msgid "Collapse Diff" -msgstr "" - -#: kallithea/templates/base/root.html:36 -msgid "Expand Diff" -msgstr "" - -#: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" -msgstr "" - #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" -msgstr "Widerruf der Rechte für {0}: {1} bestätigen?" +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 +msgid "Collapse Diff" +msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "Aktiviert" +#: kallithea/tests/data/templates/base/root.html.py:113 +msgid "Expand Diff" +msgstr "" #: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "Deaktiviert" - -#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/base/root.html.py:115 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "Widerruf der Rechte für {0}: {1} bestätigen?" + +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "Änderungssätze auswählen" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 msgid "Specify changeset" msgstr "Changeset angeben" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "Autor" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "Revision" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "Klicken um Aufsteigend zu Sortieren" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "Klicken um Absteigend zu Sortieren" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "Keine Datensätze gefunden." + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "Datenfehler." + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." +msgstr "Lade..." #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 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 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 #, python-format msgid "" "Changeset status: %s by %s\n" "Click to open associated pull request %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/changelog/changelog_summary_data.html:24 +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 #, fuzzy, python-format -#| msgid "Set changeset status" msgid "Changeset status: %s by %s" msgstr "Setze Changesetstatus" +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 +msgid "Expand commit message" +msgstr "" + #: kallithea/templates/changelog/changelog.html:116 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:125 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:57 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:141 -#: kallithea/templates/changelog/changelog_summary_data.html:63 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#: kallithea/templates/compare/compare_cs.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:203 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:146 -#: kallithea/templates/changelog/changelog_summary_data.html:68 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "Branch %s" -#: kallithea/templates/changelog/changelog.html:311 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "Bisher gibt es keine Änderungen" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:47 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "Revision" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "Alter" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "Autor" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:87 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:93 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 #, fuzzy msgid "Push new repository" msgstr "privates Repository" -#: kallithea/templates/changelog/changelog_summary_data.html:101 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:39 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:75 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 msgid "Merge" msgstr "" +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 +msgid "Grafted from:" +msgstr "" + #: kallithea/templates/changeset/changeset.html:123 -msgid "Grafted from:" +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 +msgid "Transplanted from:" msgstr "" #: kallithea/templates/changeset/changeset.html:129 -msgid "Transplanted from:" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 #, fuzzy msgid "Replaced by:" msgstr "Erstellt von" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 #, fuzzy msgid "Preceded by:" msgstr "Erstellt von" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:329 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:62 -#: kallithea/templates/pullrequests/pullrequest_show.html:331 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:231 -#: kallithea/templates/changeset/changeset.html:268 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 #, fuzzy msgid "No revisions" msgstr "revisionen" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 #, fuzzy msgid "on pull request" msgstr "Kommentar von Pull Request" -#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 msgid "No title" msgstr "Kein Titel" -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 #, fuzzy msgid "on this changeset" msgstr "%s Changesets" -#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 msgid "Delete comment?" msgstr "Kommentar löschen?" -#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 #, fuzzy msgid "Status change" msgstr "Letzte Änderungen" -#: kallithea/templates/changeset/changeset_file_comment.html:59 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 msgid "Commenting on line." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:60 +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 msgid "" "Comments are in plain text. Use @username inside this text to notify " "another user." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 msgid "Set changeset status" msgstr "Setze Changesetstatus" -#: kallithea/templates/changeset/changeset_file_comment.html:69 +#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:75 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 msgid "No change" msgstr "Keine Änderungen" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 #, fuzzy msgid "Finish pull request" msgstr "Kommentar von Pull Request" -#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 msgid "Close" msgstr "Schließen" -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 msgid "Submitting ..." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:104 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "Kommentar" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:116 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d Kommentar" msgstr[1] "%d Kommentare" -#: kallithea/templates/changeset/changeset_file_comment.html:129 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "%d inline" msgstr[1] "%d inline" -#: kallithea/templates/changeset/changeset_file_comment.html:130 +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 #, python-format msgid "%d general" msgid_plural "%d general" @@ -5134,225 +5501,361 @@ msgstr[1] "%d generell" #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "Datei entfernt" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "Ungeändert" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 msgid "Deleted" msgstr "Gelöscht" -#: kallithea/templates/changeset/diff_block.html:57 +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 msgid "Renamed" msgstr "Umbenannt" -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Unbekannte Revision %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Kein Dateiname" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "Datei hinzugefügt" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:69 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:83 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "" #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:85 +#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:321 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:99 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:107 +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:108 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, python-format msgid "%s changesets" msgstr "%s Changesets" -#: kallithea/templates/compare/compare_cs.html:109 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 msgid "behind" msgstr "zurück" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "" #: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "" #: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "Öffenentliches Repository" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "Abonniere den %s RSS Feed" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "Abonniere den %s ATOM Feed" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "%(user)s hat am %(when)s ein Changeset kommentiert" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Comment on Changeset \"%s\"" +msgstr "%(user)s hat am %(when)s ein Changeset kommentiert" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset" +msgid "Changeset on" +msgstr "Änderungssatz" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Zweig" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Letzte Änderungen" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "This pull request has been closed and can not be updated." +msgid "The pull request has been closed." +msgstr "" +"Dieser Pull Request wurde geschlossen und kann daher nicht aktualisiert " +"werden." + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "Hallo %s" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 #, fuzzy msgid "We have received a request to reset the password for your account." msgstr "" "Wir haben eine Anforderung erhalten, für deinen Account ein neues " "Passwort zu erstellen." -#: kallithea/templates/email_templates/password_reset.html:8 +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 msgid "" "This account is however managed outside this system and the password " "cannot be changed here." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:13 +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "Pull Request [kommentiert] für" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "on pull request" +msgid "Pull request from" +msgstr "Kommentar von Pull Request" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +#, fuzzy +#| msgid "Date" +msgid "at" +msgstr "Datum" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 -#, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "" +#, fuzzy, python-format +#| msgid "%(user)s commented on pull request %(age)s" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "%(user)s hat am %(when)s einen Pull Request kommentiert" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s from %s#%s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "Pull Request #%s von %s#%s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "Pull Request [kommentiert] für" + +#: kallithea/templates/email_templates/registration.html:22 +#, fuzzy +#| msgid "Group name" +msgid "Full Name" +msgstr "Gruppen name" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5370,83 +5873,105 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "oder" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 +#: kallithea/tests/data/templates/files/files_add.html.py:241 #, fuzzy msgid "New file type" msgstr "neue Datei" -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 msgid "Commit Changes" msgstr "Änderungen einchecken" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 -msgid "Size" -msgstr "Größe" - -#: kallithea/templates/files/files_browser.html:62 -msgid "Last Revision" -msgstr "" - #: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 +msgid "Size" +msgstr "Größe" + +#: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 msgid "Last Modified" msgstr "Zuletzt geändert" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 msgid "Last Committer" msgstr "" @@ -5456,7 +5981,7 @@ msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "Datei löschen" @@ -5469,110 +5994,130 @@ msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "%s Autor" msgstr[1] "%s Autoren" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, fuzzy, python-format +#| msgid "Deleted branch: %s" +msgid "Edit on Branch: %s" +msgstr "Branch %s gelöscht" + +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "" -#: kallithea/templates/files/files_source.html:74 +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 #, fuzzy msgid "File is too big to display." msgstr "Die Datei ist zu groß, um sie anzuzeigen" -#: kallithea/templates/files/files_source.html:76 +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 msgid "Show full annotation anyway." msgstr "" -#: kallithea/templates/files/files_source.html:78 +#: kallithea/templates/files/files_source.html:73 +#: kallithea/tests/data/templates/files/files_source.html.py:133 msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "Zurück" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "" @@ -5581,70 +6126,80 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "Privat" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "Berechtigungen kopieren" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 msgid "ATOM journal feed" msgstr "ATOM Logbuch Feed" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "RSS Logbuch Feed" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "Meine Repositories" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "" @@ -5658,34 +6213,45 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 msgid "New Pull Request" msgstr "Neuer Pull Request" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "Titel" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "" @@ -5721,7 +6287,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "" @@ -5739,119 +6307,153 @@ msgstr "Löschen der Gruppe bestätigen: %s mit %s Repository" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, fuzzy, python-format msgid "%s Pull Request %s" msgstr "Pull Request #%s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, fuzzy, python-format msgid "Pull request %s from %s#%s" msgstr "Pull Request #%s von %s#%s" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 msgid "Summarize the changes" msgstr "Zusammenfassung der Änderungen" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 msgid "There are no reviewers" msgstr "Es gibt keine Reviewers" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 msgid "on" msgstr "in" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "Aktualisierung" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 +#, fuzzy +#| msgid "Registration" +msgid "Next iteration" +msgstr "Registrierung" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:215 +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 msgid "" -"Pull requests do not change once created. Select a revision and save to " -"replace this pull request with a new one." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:224 +"Pull request iterations do not change content once created. Select a " +"revision and save to make a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +msgid "Cancel Changes" +msgstr "Änderungen verwerfen" + +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 msgid "Pull Request Reviewers" msgstr "Pull Request Reviewers" -#: kallithea/templates/pullrequests/pullrequest_show.html:249 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 msgid "Remove reviewer" msgstr "Reviewer entfernen" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:269 +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 msgid "Potential Reviewers" msgstr "Potentielle Reviewer" -#: kallithea/templates/pullrequests/pullrequest_show.html:272 +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:295 -msgid "Save Changes" -msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 +msgid "Pull Request Content" +msgstr "Inhalt des Pull Requests" #: kallithea/templates/pullrequests/pullrequest_show.html:296 -#, fuzzy -msgid "Save Updates as New Pull Request" -msgstr "Als neuen Pull Request speichern" - -#: kallithea/templates/pullrequests/pullrequest_show.html:297 -msgid "Cancel Changes" -msgstr "Änderungen verwerfen" - -#: kallithea/templates/pullrequests/pullrequest_show.html:307 -msgid "Pull Request Content" -msgstr "Inhalt des Pull Requests" +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +msgid "Common ancestor" +msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format @@ -5868,240 +6470,466 @@ msgid "Pull Requests to '%s'" msgstr "Pull Requests für '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "Einen neuen Pull Request eröffnen" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "Zeige Pull Requests für '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "Zeige Pull Requests von '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "Von mir erstellte Pull Requests" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +#, fuzzy +#| msgid "Pull Request Reviewers" +msgid "Pull Requests Needing My Review" +msgstr "Pull Request Reviewers" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 msgid "Search in All Repositories" msgstr "Suche in allen Repositories" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "Suchbegriff" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "Suchen in" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "Dateiinhalt" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "Commit Nachrichten" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "Dateinamen" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "Zugriff verweigert" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "Aktiviere" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "Dateien" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "Mehr anzeigen" +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 +msgid "commits" +msgstr "Commits" + +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "Dateien hinzugefügt" + #: kallithea/templates/summary/statistics.html:390 -msgid "commits" -msgstr "Commits" +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" +msgstr "Dateien geändert" #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "Dateien hinzugefügt" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" -msgstr "Dateien geändert" - -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/tests/data/templates/summary/statistics.html.py:153 msgid "files removed" msgstr "Dateien entfernt" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:393 +#: kallithea/tests/data/templates/summary/statistics.html.py:155 msgid "commit" msgstr "Commit" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 msgid "file added" msgstr "Datei hinzugefügt" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:395 +#: kallithea/tests/data/templates/summary/statistics.html.py:159 msgid "file changed" msgstr "Datei geändert" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:396 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "Datei entfernt" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "Clone von" +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 +msgid "Show by ID" +msgstr "" + #: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "Clone-URL" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/summary/summary.html.py:143 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "" +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 +msgid "Download" +msgstr "" + +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 +msgid "Downloads are disabled for this repository" +msgstr "" + #: kallithea/templates/summary/summary.html:108 -msgid "Download" -msgstr "" +#: kallithea/tests/data/templates/summary/summary.html.py:190 +msgid "Download as zip" +msgstr "Herunterladen als zip" #: kallithea/templates/summary/summary.html:112 -msgid "There are no downloads yet" +#: kallithea/tests/data/templates/summary/summary.html.py:194 +msgid "Check this to download archive with subrepos" msgstr "" #: kallithea/templates/summary/summary.html:114 -msgid "Downloads are disabled for this repository" -msgstr "" - -#: kallithea/templates/summary/summary.html:120 -msgid "Download as zip" -msgstr "Herunterladen als zip" - -#: kallithea/templates/summary/summary.html:125 -msgid "Check this to download archive with subrepos" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 +#: kallithea/tests/data/templates/summary/summary.html.py:196 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "Repository Größe" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "Feed" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 msgid "Latest Changes" msgstr "Letzte Änderungen" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 msgid "Quick Start" msgstr "Schnelleinstieg" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "Liesmich-Datei von Revision %s:%s" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "%s als %s herunterladen" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "%s Tags" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "Tags vergleichen" +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "Übersichtsseite" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "Gruppenname" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "Login Speichern" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "benenne diese Datei..." + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "Benutzerbild ändern unter" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "E-Mailadresse fehlt, bitte aktualisieren." + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "Web" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "" +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." +"\n" +" The following " +"variables are available:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "" +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "Schnellfilter..." + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "Passwort vergessen?" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +msgid "The comment was made with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" +msgstr "Repository Größe" #~ msgid "No comments." #~ msgstr "Keine Kommentare." @@ -6172,11 +7000,6 @@ #~ msgid "delete" #~ msgstr "löschen" -#~ msgid "" -#~ "_: \n" -#~ "" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "Rechteverwaltung" @@ -6387,7 +7210,199 @@ #~ msgid "Created by" #~ msgstr "Erstellt von" +#~ msgid "Closed, replaced by %s ." +#~ msgstr "Geschlossen, ersetzt durch %s." + +#~ msgid "Closing." +#~ msgstr "Schließen." + +#~ msgid "Repository no access" +#~ msgstr "Kein Zugriff auf Repository" + +#~ msgid "Repository read access" +#~ msgstr "Lesender Zugriff auf Repository" + +#~ msgid "Repository write access" +#~ msgstr "Schreibdender Zugriff auf Repository" + +#~ msgid "Repository admin access" +#~ msgstr "Administrativer Zugang zum Repository" + +#~ msgid "Repository Group no access" +#~ msgstr "Repository Gruppe hat Keinen Zugriff" + +#~ msgid "Repository Group read access" +#~ msgstr "Repository Gruppe hat lesenden Zugriff" + +#~ msgid "Repository Group write access" +#~ msgstr "Repository Gruppe hat schreibenden Zugriff" + +#~ msgid "Repository Group admin access" +#~ msgstr "Repository Gruppe hat Administrativen Zugriff" + +#~ msgid "Repository creation disabled" +#~ msgstr "Erstellung eines Repositorys deaktiviert" + +#~ msgid "Repository creation enabled" +#~ msgstr "Erstellung eines Repositorys aktiviert" + +#~ msgid "Repository forking disabled" +#~ msgstr "Forking eines Repositorys deaktiviert" + +#~ msgid "Repository forking enabled" +#~ msgstr "Forking eines Repositorys aktiviert" + +#~ msgid "Register disabled" +#~ msgstr "Registrierung deaktiviert" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "Registrierung neuer Benutzer in Kallithea mit manueller Aktivierung" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "Registrierung neuer Benutzer in Kallithea mit Automatischer Aktivierung" + +#~ msgid "Not Reviewed" +#~ msgstr "Nicht Begutachtet" + +#~ msgid "Rejected" +#~ msgstr "Abgelehnt" + +#~ msgid "Under Review" +#~ msgstr "In Begutachtung" + +#~ msgid "Repository group no access" +#~ msgstr "Kein Zugriff für Repositorygruppe" + +#~ msgid "Repository group read access" +#~ msgstr "Lesezugriff für Repositorygruppe" + +#~ msgid "Repository group write access" +#~ msgstr "Schreibzugriff für Repositorygruppe" + +#~ msgid "Repository group admin access" +#~ msgstr "Administrativer Zugriff für Repositorygruppe" + +#~ msgid "User group no access" +#~ msgstr "Kein Zugriff für Benutzergruppe" + +#~ msgid "User group read access" +#~ msgstr "Lesezugriff für Benutzergruppe" + +#~ msgid "User group write access" +#~ msgstr "Nutzergruppe Schreibzugriff" + +#~ msgid "User group admin access" +#~ msgstr "Administrativer Zugriff für Benutzergruppe" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "Erstellung von Repositorygruppen deaktiviert" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "Erstellung von Repositorygruppen aktiviert" + +#~ msgid "User Group creation disabled" +#~ msgstr "Erstellung von Benutzergruppen deaktiviert" + +#~ msgid "User Group creation enabled" +#~ msgstr "Erstellung von Benutzergruppen aktiviert" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "Benutzerregistrierung mit manueller Kontoaktivierung" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "Benutzerregistrierung mit automatische Kontoaktivierung" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" +#~ "Review Request für %(repo_name)s Pull " +#~ "Request #%(pr_id)s von %(ref)s erstellt " +#~ "von %(pr_username)s" + +#~ msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" +#~ "Kommentar von %(comment_username)s für " +#~ "%(repo_name)s Pull Request #%(pr_id)s von " +#~ "%(ref)s" + +#~ msgid "repositories" +#~ msgstr "Repositories" + +#~ msgid "No repositories found." +#~ msgstr "Keine Repositories gefunden." + +#~ msgid "There are no branches yet" +#~ msgstr "Es gibt bisher keine Branches" + +#~ msgid "There are no tags yet" +#~ msgstr "Es gibt bisher keine Tags" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "Es gibt bisher keine Lesezeichen" + +#~ msgid "Analytics HTML block" +#~ msgstr "" + #~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request %s" +#~ "HTML with JavaScript for web analytics" +#~ " systems like Google Analytics or " +#~ "Piwik. This will be added at the" +#~ " bottom of every page." +#~ msgstr "" + +#~ msgid "" +#~ "Schema of clone URL construction eg. " +#~ "'{scheme}://{user}@{netloc}/{repo}'.\n" +#~ " The " +#~ "following variables are available:\n" +#~ " {scheme}" +#~ " 'http' or 'https' sent from running" +#~ " Kallithea server,\n" +#~ " {user}" +#~ " current user username,\n" +#~ " {netloc}" +#~ " network location/server host of running" +#~ " Kallithea server,\n" +#~ " {repo}" +#~ " full repository name,\n" +#~ " {repoid}" +#~ " ID of repository, can be used " +#~ "to contruct clone-by-id" +#~ msgstr "" + +#~ msgid "enabled" +#~ msgstr "Aktiviert" + +#~ msgid "%s Bookmarks" #~ msgstr "" + +#~ msgid "Compare Bookmarks" +#~ msgstr "" + +#~ msgid "%s Branches" +#~ msgstr "" + +#~ msgid "Compare Branches" +#~ msgstr "" + +#~ msgid "Editing file" +#~ msgstr "" + +#~ msgid "Update" +#~ msgstr "Aktualisierung" + +#~ msgid "" +#~ "Pull requests do not change once " +#~ "created. Select a revision and save " +#~ "to replace this pull request with " +#~ "a new one." +#~ msgstr "" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "Als neuen Pull Request speichern" + +#~ msgid "%s Tags" +#~ msgstr "%s Tags" + +#~ msgid "Compare Tags" +#~ msgstr "Tags vergleichen" + diff -r a48802bf7134 -r 880e2f07651b kallithea/i18n/el/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/el/LC_MESSAGES/kallithea.po Thu Jul 27 03:02:37 2017 +0200 +++ b/kallithea/i18n/el/LC_MESSAGES/kallithea.po Thu Jul 27 14:26:14 2017 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2016-03-14 16:51+0100\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: 2017-06-14 18:51+0000\n" "Last-Translator: Asterios Dimitriou \n" "Language-Team: Greek " @@ -19,83 +19,106 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 2.15-dev\n" -#: kallithea/controllers/changelog.py:85 -#: kallithea/controllers/pullrequests.py:240 kallithea/lib/base.py:515 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "Δεν υπάρχουν σετ αλλαγών ακόμα" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "Χωρίς" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:198 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "(κλειστό)" -#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "Εμφάνιση κενού" -#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 msgid "Ignore whitespace" msgstr "Αγνόηση κενού" -#: kallithea/controllers/changeset.py:168 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Αύξηση του diff πλαισίου σε %(num)s γραμμές" -#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:744 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "Δεν υπάρχει τέτοια αναθεώρηση για αυτό το αποθετήριο" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "Επιλογή σετ αλλαγών" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, fuzzy, python-format +#| msgid "Error creating repository %s" +msgid "Could not find other repository %s" +msgstr "Βλάβη κατά τη δημιουργία του αποθετηρίου %s" + +#: kallithea/controllers/compare.py:73 +#, fuzzy +#| msgid "Cannot compare repositories without using common ancestor" +msgid "Cannot compare repositories of different types" +msgstr "" +"Δεν μπορεί να γίνει σύγκριση αποθετηρίων χωρίς να χρησιμοποιηθεί κοινός " +"πρόγονος" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "" "Δεν μπορεί να γίνει σύγκριση αποθετηρίων χωρίς να χρησιμοποιηθεί κοινός " "πρόγονος" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 msgid "No response" msgstr "Χωρίς απόκριση" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "Άγνωστο λάθος" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" "Η αίτηση δεν μπόρεσε να ερμηνευτεί από τον εξυπηρετητή λόγω κακής " "διατύπωσης." -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Ανεξουσιοδοτημένη πρόσβαση στον πόρο" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "Δεν έχετε άδεια για να εμφανίσετε αυτή τη σελίδα" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "Ο πόρος δεν μπορεί να βρεθεί" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -103,378 +126,399 @@ "Ο εξυπηρετητής συνάντησε μια απρόσμενη κατάσταση που τον απέτρεψαν να " "πραγματοποιήσει την αίτηση." -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "Αλλαγές στο αποθετήριο %s" - -#: kallithea/controllers/feed.py:56 +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 +#: kallithea/templates/changeset/changeset.html:195 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 +msgid "Changeset was too big and was cut off..." +msgstr "Το σετ αλλαγών ήταν πολύ μεγάλο και περικόπηκε..." + +#: kallithea/controllers/feed.py:84 +#, python-format +msgid "%s committed on %s" +msgstr "%s συνέβαλε στο %s" + +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 #, python-format msgid "%s %s feed" msgstr "%s %s τροφοδοσία" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 -msgid "Changeset was too big and was cut off..." -msgstr "Το σετ αλλαγών ήταν πολύ μεγάλο και περικόπηκε..." - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "%s συνέβαλε στο %s" - -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 +#, python-format +msgid "Changes on %s repository" +msgstr "Αλλαγές στο αποθετήριο %s" + +#: kallithea/controllers/files.py:93 msgid "Click here to add new file" msgstr "Κλικ εδώ για προθήκη νέου αρχείου" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "Δεν υπάρχουν αρχεία ακόμα. %s" -#: kallithea/controllers/files.py:195 +#: kallithea/controllers/files.py:191 #, python-format msgid "%s at %s" msgstr "%s την %s" -#: kallithea/controllers/files.py:307 kallithea/controllers/files.py:367 -#: kallithea/controllers/files.py:434 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Το αποθετήριο κλειδώθηκε από %s την %s" -#: kallithea/controllers/files.py:319 +#: kallithea/controllers/files.py:309 #, fuzzy msgid "You can only delete files with revision being a valid branch" msgstr "" "Μπορείτε να διαγράψετε μόνο αρχεία σε αναθεώρηση που βρίσκονται σε έγκυρη" " διακλάδωση " -#: kallithea/controllers/files.py:330 +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Διαγραφή αρχείου %s μέσω του Kallithea" -#: kallithea/controllers/files.py:352 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "Επιτυχής διαγραφή αρχείου %s" -#: kallithea/controllers/files.py:356 kallithea/controllers/files.py:422 -#: kallithea/controllers/files.py:503 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "Συνέβη λάθος κατά το commit" -#: kallithea/controllers/files.py:379 +#: kallithea/controllers/files.py:369 msgid "You can only edit files with revision being a valid branch" msgstr "" "Μπορείτε να επεξεργαστείτε μόνο αρχεία σε αναθεώρηση που βρίσκονται σε " "έγκυρη διακλάδωση" -#: kallithea/controllers/files.py:393 +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "Επεξεργασία αρχείου %s μέσω του Kallithea" -#: kallithea/controllers/files.py:409 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "Καμία αλλαγή" -#: kallithea/controllers/files.py:418 kallithea/controllers/files.py:492 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "Επιτυχής παράδοση σε %s" -#: kallithea/controllers/files.py:445 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "Προσθήκη αρχείου μέσω Kallithea" -#: kallithea/controllers/files.py:466 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "Χωρίς περιεχόμενο" -#: kallithea/controllers/files.py:470 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "Χωρίς όνομα αρχείου" -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Η τοποθεσία πρέπει να είναι σχετική διαδρομή και να μην περιέχει .. μέσα " "της" -#: kallithea/controllers/files.py:528 +#: kallithea/controllers/files.py:517 msgid "Downloads disabled" msgstr "Οι μεταφορτώσεις απενεργοποιήθηκαν" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:528 #, python-format msgid "Unknown revision %s" msgstr "Άγνωστη αναθεώρηση %s" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "Άδειο αποθετήριο" -#: kallithea/controllers/files.py:543 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "Άγνωστος τύπος αρχειοθέτησης" -#: kallithea/controllers/files.py:773 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "Σετ αλλαγών" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "Κλάδοι" -#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "Ετικέτες" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "Συνέβει ένα λάθος κατά την διακλάδωση του αποθετηρίου %s" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "Ομάδες" -#: kallithea/controllers/home.py:94 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:479 -#: kallithea/templates/base/base.html:653 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "Αποθετήρια" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "Κλάδος" -#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "Κλειστοί Κλάδοι" -#: kallithea/controllers/home.py:151 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "Ετικέτα" -#: kallithea/controllers/home.py:157 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "Σελιδοδείκτης" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "Δημόσιο Ημερολόγιο" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:306 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "Ημερολόγιο" -#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 msgid "Bad captcha" msgstr "Λάθος captcha" -#: kallithea/controllers/login.py:150 +#: kallithea/controllers/login.py:148 +#, python-format msgid "You have successfully registered with %s" msgstr "Εγγραφήκατε επιτυχώς στο %s" -#: kallithea/controllers/login.py:195 +#: kallithea/controllers/login.py:193 msgid "A password reset confirmation code has been sent" msgstr "Στάλθηκε ένας κωδικός επιβεβαίωσης επαναφοράς του συνθηματικού" -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:242 msgid "Invalid password reset token" msgstr "Άκυρο τεκμήριο (token) επαναφοράς του συνθηματικού" -#: kallithea/controllers/login.py:249 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "Το συνθηματικό ενημερώθηκε επιτυχώς" -#: kallithea/controllers/pullrequests.py:123 -#, python-format -msgid "%s (closed)" -msgstr "%s (κλειστό)" - -#: kallithea/controllers/pullrequests.py:151 -#: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 -msgid "Changeset" -msgstr "Σετ αλλαγών" - -#: kallithea/controllers/pullrequests.py:172 -msgid "Special" -msgstr "Ειδικός" - -#: kallithea/controllers/pullrequests.py:173 -msgid "Peer branches" -msgstr "Ομότιμοι κλάδοι" - -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 -msgid "Bookmarks" -msgstr "Σελιδοδείκτες" - -#: kallithea/controllers/pullrequests.py:312 -#, python-format -msgid "Error creating pull request: %s" -msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" - -#: kallithea/controllers/pullrequests.py:358 -#: kallithea/controllers/pullrequests.py:505 -msgid "No description" -msgstr "Χωρίς περιγραφή" - -#: kallithea/controllers/pullrequests.py:365 -msgid "Successfully opened new pull request" -msgstr "Ένα νέο αίτημα έλξης (pull request) δημιουργήθηκε επιτυχώς" - -#: kallithea/controllers/pullrequests.py:368 -#: kallithea/controllers/pullrequests.py:455 -#: kallithea/controllers/pullrequests.py:512 +#: kallithea/controllers/pullrequests.py:73 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "Καθορίστηκε άκυρος σχολιαστής \"%s\"" -#: kallithea/controllers/pullrequests.py:371 -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:135 +#, python-format +msgid "%s (closed)" +msgstr "%s (κλειστό)" + +#: kallithea/controllers/pullrequests.py:162 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 +msgid "Changeset" +msgstr "Σετ αλλαγών" + +#: kallithea/controllers/pullrequests.py:183 +msgid "Special" +msgstr "Ειδικός" + +#: kallithea/controllers/pullrequests.py:184 +msgid "Peer branches" +msgstr "Ομότιμοι κλάδοι" + +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 +msgid "Bookmarks" +msgstr "Σελιδοδείκτες" + +#: kallithea/controllers/pullrequests.py:326 +#, python-format +msgid "Error creating pull request: %s" +msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" + +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 msgid "Error occurred while creating pull request" msgstr "Λάθος κατά τη δημιουργία αιτήματος έλξης (pull request)" -#: kallithea/controllers/pullrequests.py:403 -msgid "Missing changesets since the previous pull request:" -msgstr "Ελλιπή σετ αλλαγών από την προηγούμενη αίτηση έλξης:" +#: kallithea/controllers/pullrequests.py:358 +msgid "Successfully opened new pull request" +msgstr "Ένα νέο αίτημα έλξης (pull request) δημιουργήθηκε επιτυχώς" + +#: kallithea/controllers/pullrequests.py:381 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" +msgstr "Δημιουργήθηκε ενημέρωση αιτήματος έλξης" #: kallithea/controllers/pullrequests.py:410 #, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "Καινούρια σετ αλλαγών στα %s %s από την προηγούμενη αίτηση έλξης:" - -#: kallithea/controllers/pullrequests.py:417 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "Το γονικό δεν άλλαξε - εμφάνισε τις διαφορές από την προηγούμενη έκδοση:" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" -"Αυτή η αίτηση έλξης είναι βασισμένη σε μία άλλη %s αναθεώρηση και δεν " -"υπάρχει ένα απλό diff." - -#: kallithea/controllers/pullrequests.py:426 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "Δεν βρέθηκαν αλλαγές στο %s %s από την προηγούμενη έκδοση." - -#: kallithea/controllers/pullrequests.py:464 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "Κλειστό, αντικαταστάθηκε από %s." - -#: kallithea/controllers/pullrequests.py:472 -msgid "Pull request update created" -msgstr "Δημιουργήθηκε ενημέρωση αιτήματος έλξης" - -#: kallithea/controllers/pullrequests.py:516 +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:414 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "Χωρίς περιγραφή" + +#: kallithea/controllers/pullrequests.py:439 msgid "Pull request updated" msgstr "Ενημερώθηκε η αίτηση έλξης" -#: kallithea/controllers/pullrequests.py:531 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "Επιτυχής διαγραφή αιτήματος έλξης" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:491 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "Δεν βρέθηκαν σετ αλλαγών για ενημέρωση αυτού του αιτήματος έλξης." + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "Το αίτημα έλξης έχει ήδη συγχωνευτεί με το %s." -#: kallithea/controllers/pullrequests.py:599 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "Αυτό το αίτημα έλξης έχει κλείσει και δεν μπορεί να ενημερωθεί." -#: kallithea/controllers/pullrequests.py:617 -#, python-format -msgid "The following changes are available on %s:" +#: kallithea/controllers/pullrequests.py:552 +#, fuzzy, python-format +#| msgid "The following changes are available on %s:" +msgid "The following additional changes are available on %s:" msgstr "Οι ακόλουθες αλλαγές είναι διαθέσιμες στο %s:" -#: kallithea/controllers/pullrequests.py:621 -msgid "No changesets found for updating this pull request." +#: kallithea/controllers/pullrequests.py:556 +#, fuzzy +#| msgid "No changesets found for updating this pull request." +msgid "No additional changesets found for iterating on this pull request." msgstr "Δεν βρέθηκαν σετ αλλαγών για ενημέρωση αυτού του αιτήματος έλξης." -#: kallithea/controllers/pullrequests.py:629 +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Σημείωση: Ο κλάδος %s έχει άλλη κεφαλή (head): %s." -#: kallithea/controllers/pullrequests.py:635 -msgid "Git pull requests don't support updates yet." +#: kallithea/controllers/pullrequests.py:571 +#, fuzzy +#| msgid "Git pull requests don't support updates yet." +msgid "Git pull requests don't support iterating yet." msgstr "Αιτήματα έλξης του git δεν υποστηρίζουν ακόμα ενημερώσεις." -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:573 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "Δεν βρέθηκαν σετ αλλαγών για ενημέρωση αυτού του αιτήματος έλξης." + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 msgid "No permission to change pull request status" msgstr "Χωρίς δικαιώματα αλλαγής της κατάστασης του αιτήματος έλξης" -#: kallithea/controllers/pullrequests.py:738 +#: kallithea/controllers/pullrequests.py:676 #, python-format msgid "Successfully deleted pull request %s" msgstr "Επιτυχής διαγραφή αιτήματος έλξης %s" -#: kallithea/controllers/pullrequests.py:748 -msgid "Closing." -msgstr "Κλείνει." - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "Άκυρο αίτημα αναζήτησης. Δοκιμάστε με εισαγωγικά." -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" "Δεν υπάρχει ευρετήριο για την αναζήτηση. Παρακαλώ τρέξτε τον whoosh για " "την δημιουργία του" -#: kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Ένα λάθος συνέβη κατά την διαδικασία αναζήτησης." -#: kallithea/controllers/summary.py:181 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 msgid "No data ready yet" msgstr "Δεν υπάρχουν ακόμα έτοιμα δεδομένα" -#: kallithea/controllers/summary.py:184 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "Τα στατιστικά είναι απενεργοποιημένα για αυτό το αποθετήριο" @@ -486,151 +530,155 @@ msgid "error occurred during update of auth settings" msgstr "παρουσιάστηκε βλάβη κατά την ενημέρωση των ρυθμίσεων εξουσιοδότησης" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "Οι προεπιλεγμένες ρυθμίσεις ενημερώθηκαν επιτυχώς" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "Συνέβη μία βλάβη κατά την ενημέρωση των προεπιλογών" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 msgid "Forever" msgstr "Πάντα" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "5 minutes" msgstr "5 λεπτά" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 hour" msgstr "1 ώρα" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 msgid "1 day" msgstr "1 ημέρα" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "1 μήνας" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:290 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "Διάρκεια ζωής" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "Συνέβη μία βλάβη κατά τη δημιουργία του gist" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "Διαγράφηκε το gist %s" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:200 msgid "Unmodified" msgstr "Mη τροποποιημένo" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "Το περιεχόμενο του gist ενημερώθηκε επιτυχώς" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "Τα δεδομένα του gist ενημερώθηκαν επιτυχώς" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "Σφάλμα συνέβη κατά την ενημέρωση του gist %s" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Δεν μπορείτε να επεξεργαστείτε αυτόν το χρήστη καθώς είναι κρίσιμος για " "όλη την εφαρμογή" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "Ο λογαριασμός σας ενημερώθηκε επιτυχώς" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:201 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "Συνέβη ένα σφάλμα κατά την ενημέρωση του χρήστη %s" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "Συνέβη ένα σφάλμα κατά την ενημέρωση του κωδικού του χρήστη" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "Προστέθηκε το email %s στον χρήστη" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "Συνέβη ένα σφάλμα κατά την αποθήκευση του email" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "Αφαιρέθηκε το email από τον χρήστη" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "Το API κλειδί δημιουργήθηκε επιτυχώς" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "Το API κλειδί επαναφέρθηκε επιτυχώς" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:324 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "Το API κλειδί διαγράφηκε επιτυχώς" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "Ανάγνωση" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" -msgstr "Εγγραφή" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" +msgstr "Ανάγνωση" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "Εγγραφή" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -638,610 +686,642 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:336 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:344 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "Διαχειριστής" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "Απενεργοποιημένο" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "Επιτρέπεται με χειροποίητη ενεργοποίηση του λογαριασμού" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "Επιτρέπεται με αυτόματη ενεργοποίηση του λογαριασμού" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1705 -msgid "Manual activation of external account" -msgstr "Χειροποίητη ενεργοποίηση εξωτερικού λογαριασμού" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1706 -msgid "Automatic activation of external account" -msgstr "Αυτόματη ενεργοποίηση εξωτερικού λογαριασμού" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "Απενεργοποιημένο" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "Επιτρέπεται με χειροποίητη ενεργοποίηση του λογαριασμού" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "Επιτρέπεται με αυτόματη ενεργοποίηση του λογαριασμού" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "Χειροποίητη ενεργοποίηση εξωτερικού λογαριασμού" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "Αυτόματη ενεργοποίηση εξωτερικού λογαριασμού" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "Ενεργό" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "Τα καθολικά δικαιώματα ενημερώθηκαν επιτυχώς" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Συνέβει μια βλάβη κατά την ενημέρωση των δικαιωμάτων" -#: kallithea/controllers/admin/repo_groups.py:187 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Συνέβει μια βλάβη κατά την δημιουργία της ομάδας αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:192 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "Δημιουργήθηκε η ομάδα αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:249 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "Ενημερώθηκε η ομάδα αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:248 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Συνέβει μια βλάβη κατά την ενημέρωση της ομάδας αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:283 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Αυτή η ομάδα περιέχει %s αποθετήρια και δε μπορεί να διαγραφεί" -#: kallithea/controllers/admin/repo_groups.py:290 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Αυτή η ομάδα περιέχει %s υποομάδες και δε μπορεί να διαγραφεί" -#: kallithea/controllers/admin/repo_groups.py:296 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "Αφαιρέθηκε η ομάδα αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:301 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Συνέβει μια βλάβη κατά την διαγραφή της ομάδας αποθετηρίου %s" -#: kallithea/controllers/admin/repo_groups.py:404 -#: kallithea/controllers/admin/repo_groups.py:439 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "Δεν μπορείτε να ανακαλέσετε την άδεια σας ως διαχειριστής" -#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "Τα δικαιώματα της ομάδας αποθετηρίου ενημερώθηκαν" -#: kallithea/controllers/admin/repo_groups.py:456 -#: kallithea/controllers/admin/repos.py:397 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "Συνέβει μια βλάβη κατά την ανάκληση της άδειας" -#: kallithea/controllers/admin/repos.py:151 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "Βλάβη κατά τη δημιουργία του αποθετηρίου %s" -#: kallithea/controllers/admin/repos.py:212 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "Δημιουργήθηκε το αποθετήριο %s από το %s" -#: kallithea/controllers/admin/repos.py:221 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "Κλωνοποιήθηκε το αποθετηρίο %s ως %s" -#: kallithea/controllers/admin/repos.py:224 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "Δημιουργήθηκε το αποθετήριο %s" -#: kallithea/controllers/admin/repos.py:261 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "Το αποθετήριο %s ενημερώθηκε επιτυχώς" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "Συνέβει μια βλάβη κατά την ενημέρωση του αποθετηρίου %s" -#: kallithea/controllers/admin/repos.py:309 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "Αποσυνδέθηκαν %s κλώνοι" -#: kallithea/controllers/admin/repos.py:312 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "Διαγράφηκαν %s κλώνοι" -#: kallithea/controllers/admin/repos.py:317 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "Διαγράφηκε το αποθετήριο %s" -#: kallithea/controllers/admin/repos.py:320 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Δε μπορεί να διαγραφεί το αποθετήριο %s που ακόμα έχει κλώνους" -#: kallithea/controllers/admin/repos.py:325 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "Συνέβει μια βλάβη κατά την διαγραφή του %s" -#: kallithea/controllers/admin/repos.py:373 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "Τα δικαιώματα του αποθετηρίου ενημερώθηκαν" -#: kallithea/controllers/admin/repos.py:429 -msgid "An error occurred during creation of field" +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, fuzzy, python-format +#| msgid "An error occurred during creation of field" +msgid "An error occurred during creation of field: %r" msgstr "Συνέβει μια βλάβη κατά τη δημιουργία του πεδίου" -#: kallithea/controllers/admin/repos.py:443 +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "Συνέβει μια βλάβη κατά την απομάκρυνση του πεδίου" -#: kallithea/controllers/admin/repos.py:459 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "-- Όχι κλώνος --" -#: kallithea/controllers/admin/repos.py:490 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "Ενημερώθηκε η ορατότητα του αποθετηρίου στο δημόσιο ημερολόγιο" -#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "" "Συνέβει μια βλάβη κατά την τοποθέτηση αυτού το αποθετηρίου στο δημόσιο " "ημερολόγιο" -#: kallithea/controllers/admin/repos.py:511 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "Χωρίς" -#: kallithea/controllers/admin/repos.py:513 +#: kallithea/controllers/admin/repos.py:473 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Σημειώθηκε το αποθετήριο %s σαν κλώνος του %s" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:480 msgid "An error occurred during this operation" msgstr "Παρουσιάστηκε ένα σφάλμα κατά τη διάρκεια αυτής της λειτουργίας" -#: kallithea/controllers/admin/repos.py:536 -#: kallithea/controllers/admin/repos.py:563 +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 msgid "Repository has been locked" msgstr "Το αποθετήριο έχει κλειδωθεί" -#: kallithea/controllers/admin/repos.py:539 -#: kallithea/controllers/admin/repos.py:560 +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 msgid "Repository has been unlocked" msgstr "Το αποθετήριο έχει ξεκλειδωθεί" -#: kallithea/controllers/admin/repos.py:542 -#: kallithea/controllers/admin/repos.py:567 +#: kallithea/controllers/admin/repos.py:502 +#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during unlocking" msgstr "Παρουσιάστηκε ένα σφάλμα κατά το ξεκλείδωμα" -#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:533 msgid "Cache invalidation successful" msgstr "Η ακύρωση της cache ήταν επιτυχής" -#: kallithea/controllers/admin/repos.py:585 +#: kallithea/controllers/admin/repos.py:537 msgid "An error occurred during cache invalidation" msgstr "Παρουσιάστηκε ένα σφάλμα κατά τη διάρκεια ακύρωσης της cache" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:603 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:636 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:151 -#: kallithea/controllers/admin/settings.py:248 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:187 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:244 +#: kallithea/controllers/admin/settings.py:189 +#, fuzzy, python-format +#| msgid "Deleted repository %s" +msgid "Invalidated %s repositories" +msgstr "Διαγράφηκε το αποθετήριο %s" + +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:301 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:306 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:347 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:378 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:392 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:396 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:208 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:219 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:224 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:242 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:217 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:222 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:235 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:462 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:468 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:482 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:737 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:750 +#: kallithea/lib/auth.py:829 +msgid "You need to be a registered user to perform this action" +msgstr "" + +#: kallithea/lib/auth.py:857 +msgid "You need to be signed in to view this page" +msgstr "" + +#: kallithea/lib/base.py:449 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:768 +#: kallithea/lib/base.py:508 msgid "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/auth.py:813 -msgid "You need to be a registered user to perform this action" -msgstr "" - -#: kallithea/lib/auth.py:843 -msgid "You need to be signed in to view this page" -msgstr "" - -#: kallithea/lib/base.py:493 +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:623 -msgid "Changeset not found" -msgstr "" - -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/base.py:617 +#, python-format +msgid "Changeset for %s %s not found in %s" +msgstr "" + +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:613 +#, python-format +msgid "Changeset %s not found" +msgstr "" + +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1128 -#: kallithea/templates/compare/compare_diff.html:71 -#: kallithea/templates/pullrequests/pullrequest_show.html:337 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1469 +#: kallithea/lib/helpers.py:1230 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1249,1299 +1329,969 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:435 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:437 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:439 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:455 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:457 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:459 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:462 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:465 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1669 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2237 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2238 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1518 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1701 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1695 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1696 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1715 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1717 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 +#: kallithea/model/db.py:1718 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1719 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1720 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1722 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 +#: kallithea/model/db.py:1723 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1724 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1725 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1727 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1728 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1729 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1730 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1732 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1733 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1735 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1736 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1692 +#: kallithea/model/db.py:1738 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1693 +#: kallithea/model/db.py:1739 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1741 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1742 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1744 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1745 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1702 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1748 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1749 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2236 +#: kallithea/model/db.py:2276 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2239 +#: kallithea/model/db.py:2277 msgid "Under review" msgstr "" -#: kallithea/model/forms.py:57 -msgid "Please enter a login" +#: kallithea/model/db.py:2278 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2279 +msgid "Approved" msgstr "" #: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 -msgid "Please enter a password" -msgstr "" - #: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:165 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "" +#: kallithea/model/notification.py:240 +#, python-format +msgid "%(user)s commented on changeset %(age)s" +msgstr "" + +#: kallithea/model/notification.py:241 +#, python-format +msgid "%(user)s sent message %(age)s" +msgstr "" + +#: kallithea/model/notification.py:242 +#, python-format +msgid "%(user)s mentioned you %(age)s" +msgstr "" + +#: kallithea/model/notification.py:243 +#, python-format +msgid "%(user)s registered in Kallithea %(age)s" +msgstr "" + +#: kallithea/model/notification.py:244 +#, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:245 +#, python-format +msgid "%(user)s commented on pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:252 +#, python-format +msgid "%(user)s commented on changeset at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:253 +#, python-format +msgid "%(user)s sent message at %(when)s" +msgstr "" + #: kallithea/model/notification.py:254 #, python-format -msgid "%(user)s commented on changeset %(age)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:255 #, python-format -msgid "%(user)s sent message %(age)s" +msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" #: kallithea/model/notification.py:256 #, python-format -msgid "%(user)s mentioned you %(age)s" +msgid "%(user)s opened new pull request at %(when)s" msgstr "" #: kallithea/model/notification.py:257 #, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:266 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:302 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:288 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" + +#: kallithea/model/notification.py:291 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:293 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:307 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:321 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:708 +#: kallithea/model/pull_request.py:211 +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Cannot create empty pull request" +msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +#, fuzzy +#| msgid "Missing changesets since the previous pull request:" +msgid "Missing changesets since the previous iteration:" +msgstr "Ελλιπή σετ αλλαγών από την προηγούμενη αίτηση έλξης:" + +#: kallithea/model/pull_request.py:348 +#, fuzzy, python-format +#| msgid "New changesets on %s %s since the previous pull request:" +msgid "New changesets on %s %s since the previous iteration:" +msgstr "Καινούρια σετ αλλαγών στα %s %s από την προηγούμενη αίτηση έλξης:" + +#: kallithea/model/pull_request.py:355 +#, fuzzy +#| msgid "Ancestor didn't change - show diff since previous version:" +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "Το γονικό δεν άλλαξε - εμφάνισε τις διαφορές από την προηγούμενη έκδοση:" + +#: kallithea/model/pull_request.py:362 +#, fuzzy, python-format +#| msgid "" "This pull request is based on another %s revision and there is no +#| simple " "diff." +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" +"Αυτή η αίτηση έλξης είναι βασισμένη σε μία άλλη %s αναθεώρηση και δεν " +"υπάρχει ένα απλό diff." + +#: kallithea/model/pull_request.py:364 +#, fuzzy, python-format +#| msgid "No changes found on %s %s since previous version." +msgid "No changes found on %s %s since previous iteration." +msgstr "Δεν βρέθηκαν αλλαγές στο %s %s από την προηγούμενη έκδοση." + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" " owners or remove those repository groups: %s" msgstr "" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:368 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:418 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:419 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:96 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:98 +#: kallithea/model/validators.py:75 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:100 +#: kallithea/model/validators.py:77 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" msgstr "" -#: kallithea/model/validators.py:127 +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:111 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + +#: kallithea/model/validators.py:131 +msgid "Invalid user group name" +msgstr "" + +#: kallithea/model/validators.py:132 +#, python-format +msgid "User group \"%(usergroup)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:134 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:154 -msgid "Invalid user group name" -msgstr "" - -#: kallithea/model/validators.py:155 -#, python-format -msgid "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:157 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:197 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:198 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:200 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:258 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:273 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:289 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:304 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:335 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "" -#: kallithea/model/validators.py:351 +#: kallithea/model/validators.py:326 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:353 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:354 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:356 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:470 +#: kallithea/model/validators.py:449 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:471 +#: kallithea/model/validators.py:450 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:496 +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:511 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:513 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:563 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:604 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:697 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:714 +#: kallithea/model/validators.py:692 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:712 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:771 +#: kallithea/model/validators.py:749 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -#: kallithea/model/validators.py:783 +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:784 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:831 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:847 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +#, fuzzy, python-format +#| msgid "Updated repository group %s" +msgid "Repository Group" +msgstr "Ενημερώθηκε η ομάδα αποθετηρίου %s" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:132 +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:244 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:414 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 #, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 msgid "Reset Your Password" msgstr "" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 msgid "Send Password Reset Email" msgstr "" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 msgid "New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 msgid "Confirm New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 msgid "Admin Journal" msgstr "" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2549,148 +2299,176 @@ msgstr[1] "" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 msgid "Repository Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "" +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 -msgid "Private repository" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 -msgid "" -"Private repositories are only visible to people explicitly added as " -"collaborators." +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 +msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 +msgid "Enable download menu on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 +msgid "Enable locking" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:61 #: kallithea/templates/admin/repos/repo_edit_settings.html:84 -msgid "Enable statistics" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 -msgid "Enable statistics window on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 -msgid "Enable downloads" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 -msgid "Enable download menu on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2699,316 +2477,469 @@ msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 msgid "Never" msgstr "" +#: kallithea/templates/admin/gists/edit.html:145 +msgid "Update Gist" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:146 -msgid "Update Gist" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:147 -#: kallithea/templates/changeset/changeset_file_comment.html:105 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, python-format msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, python-format msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:31 -#: kallithea/templates/changeset/changeset_file_comment.html:95 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:431 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 msgid "Owned Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 msgid "Watched Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 msgid "Show Permissions" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, python-format msgid "Confirm to reset this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, python-format msgid "Confirm to remove this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 msgid "Remove" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "" @@ -3016,279 +2947,359 @@ msgid "Change Your Account Password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 msgid "Repositories You Own" msgstr "" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 msgid "Repositories You are Watching" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 msgid "Mark All Read" msgstr "" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +msgid "Mark as read" +msgstr "" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 msgid "Show Notification" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:430 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 msgid "Default Permissions" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 msgid "Apply to all existing repositories" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 msgid "Permissions for the Default user on new repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 msgid "Repository group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 msgid "Apply to all existing repository groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 +msgid "Permissions for the Default user on new user groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 +msgid "Top level repository creation" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:55 -msgid "Permissions for the Default user on new user groups." +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 +msgid "Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 +msgid "" +"Note: This will also give all users API access to create repositories " +"everywhere. That might change in future versions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:60 -msgid "Top level repository creation" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, python-format msgid "Confirm to delete this IP address: %s" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "" @@ -3297,31 +3308,42 @@ msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "" @@ -3345,12 +3367,14 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3361,16 +3385,36 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "Disabled" +msgid "Visible" +msgstr "Απενεργοποιημένο" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "No response" +msgid "Add repos" +msgstr "Χωρίς απόκριση" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3378,101 +3422,113 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" +#, fuzzy, python-format +#| msgid "Updated repository group %s" +msgid "Repository group %s" +msgstr "Ενημερώθηκε η ομάδα αποθετηρίου %s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 msgid "Repository Groups Administration" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3501,91 +3557,112 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 msgid "Parent" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 msgid "Public Journal Visibility" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 msgid "Add to Public Journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 msgid "Change Locking" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 +msgid "Unlock Repository" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 -msgid "Unlock Repository" +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 +#, python-format +msgid "Locked by %s on %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, python-format -msgid "Locked by %s on %s" +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 +msgid "Lock Repository" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3593,32 +3670,39 @@ "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 msgid "Delete this Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3629,101 +3713,111 @@ msgid "Invalidate Repository Cache" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 msgid "Private Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "Empty repository" +msgid "Fork of repository" +msgstr "Άδειο αποθετήριο" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 msgid "Remote repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 -msgid "Confirm to pull changes from remote repository." -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3733,33 +3827,33 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3772,312 +3866,371 @@ msgstr "" #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 msgid "Repositories Administration" msgstr "" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 msgid "Settings Administration" msgstr "" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems like Google" +" Analytics or Piwik, but also to perform " +"instance-specific customizations like adding a " +"project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 msgid "Save Settings" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 msgid "" "Check this option to remove all comments, pull requests and other records" " related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 +msgid "Install Git hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 +#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " "not seem to come from Kallithea. WARNING: This operation will destroy any" " custom git hooks you may have deployed by hand!" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/templates/admin/settings/settings_mapping.html:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 msgid "Mercurial extensions" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 +msgid "Enable hgsubversion extension" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:47 -msgid "Enable largefiles extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:51 -msgid "Enable hgsubversion extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 msgid "Location of repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting" " take effect." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4094,101 +4247,125 @@ "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." "\n" -" The following " +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user" +" username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repositories" +msgid "Repository page size" +msgstr "Αποθετήρια" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 msgid "Show Members" msgstr "" @@ -4198,13 +4375,15 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4213,48 +4392,59 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 msgid "User Groups Administration" msgstr "" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "" @@ -4264,12 +4454,14 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "" @@ -4278,7 +4470,8 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4287,715 +4480,878 @@ msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 msgid "Users Administration" msgstr "" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:142 -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:147 +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:154 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:331 +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:155 +#: kallithea/tests/data/templates/base/base.html.py:399 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:157 +#: kallithea/tests/data/templates/base/base.html.py:405 msgid "Lock" msgstr "" +#: kallithea/templates/base/base.html:165 +#: kallithea/tests/data/templates/base/base.html.py:413 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 +msgid "Fork" +msgstr "" + #: kallithea/templates/base/base.html:170 -msgid "Follow" -msgstr "" - -#: kallithea/templates/base/base.html:171 -msgid "Unfollow" -msgstr "" - -#: kallithea/templates/base/base.html:174 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 +msgid "Create Pull Request" msgstr "" #: kallithea/templates/base/base.html:175 -#: kallithea/templates/pullrequests/pullrequest.html:88 -msgid "Create Pull Request" -msgstr "" - -#: kallithea/templates/base/base.html:180 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:485 +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:305 +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "" +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 +msgid "Gists" +msgstr "" + #: kallithea/templates/base/base.html:311 -#: kallithea/templates/base/base.html:312 -msgid "Public journal" -msgstr "" - -#: kallithea/templates/base/base.html:317 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:318 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:322 +#: kallithea/tests/data/templates/base/base.html.py:525 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:330 +#: kallithea/templates/base/base.html:319 +#: kallithea/tests/data/templates/base/base.html.py:540 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:353 -#: kallithea/templates/base/base.html:354 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:377 +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:384 +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 msgid "Login to Your Account" msgstr "" +#: kallithea/templates/base/base.html:385 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:389 +msgid "Don't have an account?" +msgstr "" + #: kallithea/templates/base/base.html:407 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:434 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:615 -msgid "Keyboard shortcuts" -msgstr "" - -#: kallithea/templates/base/base.html:624 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 msgid "Inherit defaults" msgstr "" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -msgid "Add Another Comment" -msgstr "" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - #: kallithea/templates/base/root.html:25 -msgid "Group" +#: kallithea/tests/data/templates/base/root.html.py:85 +msgid "Add Another Comment" msgstr "" #: kallithea/templates/base/root.html:26 -msgid "members" +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:27 -msgid "Loading ..." +#: kallithea/tests/data/templates/base/root.html.py:89 +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:28 -msgid "loading ..." +#: kallithea/tests/data/templates/base/root.html.py:91 +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/tests/data/templates/base/root.html.py:93 +msgid "members" msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" +#: kallithea/tests/data/templates/base/root.html.py:95 +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:31 -msgid "Open New Pull Request from {0}" +#: kallithea/tests/data/templates/base/root.html.py:97 +msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" +#: kallithea/tests/data/templates/base/root.html.py:99 +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets {0} → {1}" +#: kallithea/tests/data/templates/base/root.html.py:101 +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" +#: kallithea/tests/data/templates/base/root.html.py:103 +msgid "Open New Pull Request from {0}" msgstr "" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -#: kallithea/templates/changeset/diff_block.html:21 -msgid "Collapse Diff" +#: kallithea/tests/data/templates/base/root.html.py:105 +msgid "Open New Pull Request for {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:36 -msgid "Expand Diff" +#: kallithea/tests/data/templates/base/root.html.py:107 +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" +#: kallithea/tests/data/templates/base/root.html.py:109 +msgid "Selection Link" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 +msgid "Collapse Diff" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" +#: kallithea/tests/data/templates/base/root.html.py:113 +msgid "Expand Diff" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/base/root.html.py:115 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "Επιλογή σετ αλλαγών" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 msgid "Specify changeset" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." msgstr "" #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 msgid "Go to tip of repository" msgstr "" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 #, python-format msgid "" "Changeset status: %s by %s\n" "Click to open associated pull request %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/changelog/changelog_summary_data.html:24 +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 #, python-format msgid "Changeset status: %s by %s" msgstr "" +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 +msgid "Expand commit message" +msgstr "" + #: kallithea/templates/changelog/changelog.html:116 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:125 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:57 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:141 -#: kallithea/templates/changelog/changelog_summary_data.html:63 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#: kallithea/templates/compare/compare_cs.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:203 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:146 -#: kallithea/templates/changelog/changelog_summary_data.html:68 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:311 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:47 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:87 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:93 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 msgid "Push new repository" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:101 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:39 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:75 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 msgid "Merge" msgstr "" +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 +msgid "Grafted from:" +msgstr "" + #: kallithea/templates/changeset/changeset.html:123 -msgid "Grafted from:" +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 +msgid "Transplanted from:" msgstr "" #: kallithea/templates/changeset/changeset.html:129 -msgid "Transplanted from:" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:329 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:62 -#: kallithea/templates/pullrequests/pullrequest_show.html:331 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:231 -#: kallithea/templates/changeset/changeset.html:268 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 msgid "No revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 msgid "on pull request" msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 +msgid "No title" +msgstr "" + #: kallithea/templates/changeset/changeset_file_comment.html:22 -msgid "No title" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 msgid "on this changeset" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 msgid "Delete comment?" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 msgid "Status change" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:59 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 msgid "Commenting on line." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:60 +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 msgid "" "Comments are in plain text. Use @username inside this text to notify " "another user." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 msgid "Set changeset status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:69 +#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:75 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 msgid "No change" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 #, fuzzy msgid "Finish pull request" msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" -#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 msgid "Close" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 msgid "Submitting ..." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:104 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:116 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:129 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:130 +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 #, python-format msgid "%d general" msgid_plural "%d general" @@ -5003,221 +5359,343 @@ msgstr[1] "" #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "Mη τροποποιημένo" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 msgid "Deleted" msgstr "" -#: kallithea/templates/changeset/diff_block.html:57 +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 msgid "Renamed" msgstr "" -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Άγνωστη αναθεώρηση %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Χωρίς όνομα αρχείου" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "New file type" +msgid "File after" +msgstr "Άγνωστος τύπος αρχειοθέτησης" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:69 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:83 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "" #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:85 +#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:321 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:99 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:107 +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:108 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, python-format msgid "%s changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:109 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 msgid "behind" msgstr "" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "" #: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "" #: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset" +msgid "Changeset on" +msgstr "Σετ αλλαγών" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Κλάδος" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +msgid "Status change:" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "This pull request has been closed and can not be updated." +msgid "The pull request has been closed." +msgstr "Αυτό το αίτημα έλξης έχει κλείσει και δεν μπορεί να ενημερωθεί." + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 msgid "We have received a request to reset the password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:8 +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 msgid "" "This account is however managed outside this system and the password " "cannot be changed here." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:13 +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "Finish pull request" +msgid "Pull request from" +msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +msgid "at" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 -#, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" msgstr "" #: kallithea/templates/files/diff_2way.html:15 @@ -5236,83 +5714,105 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 +#: kallithea/tests/data/templates/files/files_add.html.py:241 #, fuzzy msgid "New file type" msgstr "Άγνωστος τύπος αρχειοθέτησης" -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 msgid "Commit Changes" msgstr "" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:62 -msgid "Last Revision" -msgstr "" - #: kallithea/templates/files/files_browser.html:63 -msgid "Last Modified" +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 +msgid "Size" msgstr "" #: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 msgid "Last Committer" msgstr "" @@ -5322,7 +5822,7 @@ msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5335,109 +5835,128 @@ msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "" -#: kallithea/templates/files/files_source.html:74 +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 msgid "File is too big to display." msgstr "" -#: kallithea/templates/files/files_source.html:76 +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 msgid "Show full annotation anyway." msgstr "" -#: kallithea/templates/files/files_source.html:78 +#: kallithea/templates/files/files_source.html:73 +#: kallithea/tests/data/templates/files/files_source.html.py:133 msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "" @@ -5446,70 +5965,80 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 -msgid "ATOM journal feed" -msgstr "" - #: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "" @@ -5523,34 +6052,45 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "" @@ -5585,7 +6125,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "" @@ -5603,118 +6145,150 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, python-format msgid "%s Pull Request %s" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, python-format msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 msgid "There are no reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 msgid "on" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:215 +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 msgid "" -"Pull requests do not change once created. Select a revision and save to " -"replace this pull request with a new one." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:224 +"Pull request iterations do not change content once created. Select a " +"revision and save to make a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +msgid "Cancel Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 msgid "Pull Request Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:249 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 msgid "Remove reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:269 +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 msgid "Potential Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:272 +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:295 -msgid "Save Changes" +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 +msgid "Pull Request Content" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:296 -#, fuzzy -msgid "Save Updates as New Pull Request" -msgstr "Ένα νέο αίτημα έλξης (pull request) δημιουργήθηκε επιτυχώς" - -#: kallithea/templates/pullrequests/pullrequest_show.html:297 -msgid "Cancel Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:307 -msgid "Pull Request Content" +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +msgid "Common ancestor" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 @@ -5732,243 +6306,464 @@ msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 msgid "Search in All Repositories" msgstr "" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "" +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "" + #: kallithea/templates/summary/statistics.html:390 -msgid "commits" +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" msgstr "" #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" +#: kallithea/tests/data/templates/summary/statistics.html.py:153 +msgid "files removed" msgstr "" #: kallithea/templates/summary/statistics.html:393 -msgid "files removed" +#: kallithea/tests/data/templates/summary/statistics.html.py:155 +msgid "commit" +msgstr "" + +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 +msgid "file added" msgstr "" #: kallithea/templates/summary/statistics.html:395 -msgid "commit" +#: kallithea/tests/data/templates/summary/statistics.html.py:159 +msgid "file changed" msgstr "" #: kallithea/templates/summary/statistics.html:396 -msgid "file added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:397 -msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "" +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 +msgid "Show by ID" +msgstr "" + #: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/summary/summary.html.py:143 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "" +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 +msgid "Download" +msgstr "" + +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 +msgid "Downloads are disabled for this repository" +msgstr "" + #: kallithea/templates/summary/summary.html:108 -msgid "Download" +#: kallithea/tests/data/templates/summary/summary.html.py:190 +msgid "Download as zip" msgstr "" #: kallithea/templates/summary/summary.html:112 -msgid "There are no downloads yet" +#: kallithea/tests/data/templates/summary/summary.html.py:194 +msgid "Check this to download archive with subrepos" msgstr "" #: kallithea/templates/summary/summary.html:114 -msgid "Downloads are disabled for this repository" -msgstr "" - -#: kallithea/templates/summary/summary.html:120 -msgid "Download as zip" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 -msgid "Check this to download archive with subrepos" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 +#: kallithea/tests/data/templates/summary/summary.html.py:196 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 msgid "Latest Changes" msgstr "" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "" - -#~ msgid "" -#~ msgstr "" +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "" +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." +"\n" +" The following " +"variables are available:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "" +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +msgid "The comment was made with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" +msgstr "" #~ msgid "This pull request can be updated with changes on %s:" #~ msgstr "Αυτό το αίτημα έλξης μπορεί να ενημερωθεί με αλλαγές στο %s:" @@ -6009,7 +6804,202 @@ #~ msgid "Pull Requests from %s'" #~ msgstr "" +#~ msgid "Closed, replaced by %s ." +#~ msgstr "Κλειστό, αντικαταστάθηκε από %s." + +#~ msgid "Closing." +#~ msgstr "Κλείνει." + +#~ msgid "Changeset not found" +#~ msgstr "" + +#~ msgid "Repository no access" +#~ msgstr "" + +#~ msgid "Repository read access" +#~ msgstr "" + +#~ msgid "Repository write access" +#~ msgstr "" + +#~ msgid "Repository admin access" +#~ msgstr "" + +#~ msgid "Repository Group no access" +#~ msgstr "" + +#~ msgid "Repository Group read access" +#~ msgstr "" + +#~ msgid "Repository Group write access" +#~ msgstr "" + +#~ msgid "Repository Group admin access" +#~ msgstr "" + +#~ msgid "Repository creation disabled" +#~ msgstr "" + +#~ msgid "Repository creation enabled" +#~ msgstr "" + +#~ msgid "Repository forking disabled" +#~ msgstr "" + +#~ msgid "Repository forking enabled" +#~ msgstr "" + +#~ msgid "Register disabled" +#~ msgstr "" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "" + +#~ msgid "Not Reviewed" +#~ msgstr "" + +#~ msgid "Rejected" +#~ msgstr "" + +#~ msgid "Under Review" +#~ msgstr "" + +#~ msgid "Repository group no access" +#~ msgstr "" + +#~ msgid "Repository group read access" +#~ msgstr "" + +#~ msgid "Repository group write access" +#~ msgstr "" + +#~ msgid "Repository group admin access" +#~ msgstr "" + +#~ msgid "User group no access" +#~ msgstr "" + +#~ msgid "User group read access" +#~ msgstr "" + +#~ msgid "User group write access" +#~ msgstr "" + +#~ msgid "User group admin access" +#~ msgstr "" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "" + +#~ msgid "User Group creation disabled" +#~ msgstr "" + +#~ msgid "User Group creation enabled" +#~ msgstr "" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "" + +#~ msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "repositories" +#~ msgstr "" + +#~ msgid "No repositories found." +#~ msgstr "" + +#~ msgid "There are no branches yet" +#~ msgstr "" + +#~ msgid "There are no tags yet" +#~ msgstr "" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "" + +#~ msgid "Analytics HTML block" +#~ msgstr "" + #~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request %s" +#~ "HTML with JavaScript for web analytics" +#~ " systems like Google Analytics or " +#~ "Piwik. This will be added at the" +#~ " bottom of every page." +#~ msgstr "" + +#~ msgid "" +#~ "Schema of clone URL construction eg. " +#~ "'{scheme}://{user}@{netloc}/{repo}'.\n" +#~ " The " +#~ "following variables are available:\n" +#~ " {scheme}" +#~ " 'http' or 'https' sent from running" +#~ " Kallithea server,\n" +#~ " {user}" +#~ " current user username,\n" +#~ " {netloc}" +#~ " network location/server host of running" +#~ " Kallithea server,\n" +#~ " {repo}" +#~ " full repository name,\n" +#~ " {repoid}" +#~ " ID of repository, can be used " +#~ "to contruct clone-by-id" +#~ msgstr "" + +#~ msgid "enabled" +#~ msgstr "" + +#~ msgid "disabled" #~ msgstr "" + +#~ msgid "%s Bookmarks" +#~ msgstr "" + +#~ msgid "Compare Bookmarks" +#~ msgstr "" + +#~ msgid "%s Branches" +#~ msgstr "" + +#~ msgid "Compare Branches" +#~ msgstr "" + +#~ msgid "Editing file" +#~ msgstr "" + +#~ msgid "Update" +#~ msgstr "" + +#~ msgid "" +#~ "Pull requests do not change once " +#~ "created. Select a revision and save " +#~ "to replace this pull request with " +#~ "a new one." +#~ msgstr "" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "Ένα νέο αίτημα έλξης (pull request) δημιουργήθηκε επιτυχώς" + +#~ msgid "%s Tags" +#~ msgstr "" + +#~ msgid "Compare Tags" +#~ msgstr "" + diff -r a48802bf7134 -r 880e2f07651b kallithea/i18n/es/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/es/LC_MESSAGES/kallithea.po Thu Jul 27 03:02:37 2017 +0200 +++ b/kallithea/i18n/es/LC_MESSAGES/kallithea.po Thu Jul 27 14:26:14 2017 +0200 @@ -1,4 +1,4 @@ -# Translations template for Kallithea. +# Spanish translations for Kallithea. # Copyright (C) 2016 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. # FIRST AUTHOR , 2016. @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2016-02-22 19:35+0100\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: 2016-03-08 09:09+0000\n" "Last-Translator: Oscar Curero \n" "Language-Team: Spanish " @@ -19,451 +19,495 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 2.5-dev\n" -#: kallithea/controllers/changelog.py:85 -#: kallithea/controllers/pullrequests.py:237 kallithea/lib/base.py:515 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "Aún no hay cambios" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "Ninguno" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:197 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "(cerrado)" -#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "Mostrar espacios en blanco" -#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 msgid "Ignore whitespace" msgstr "Ignorar espacios en blanco" -#: kallithea/controllers/changeset.py:168 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Aumentar el contexto del diff a %(num)s lineas" -#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:743 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 #, fuzzy msgid "Such revision does not exist for this repository" msgstr "La revisión no existe en este repositorio" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "Seleccionar cambios" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, python-format +msgid "Could not find other repository %s" +msgstr "" + +#: kallithea/controllers/compare.py:73 +#, fuzzy +#| msgid "Cannot compare repositories without using common ancestor" +msgid "Cannot compare repositories of different types" +msgstr "No se pueden comparar repositorios sin usar un ancestro común" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "No se pueden comparar repositorios sin usar un ancestro común" +#: kallithea/controllers/error.py:70 +msgid "No response" +msgstr "No hay respuesta" + #: kallithea/controllers/error.py:71 -msgid "No response" -msgstr "No hay respuesta" - -#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Error desconocido" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" "La petición no ha podido ser atendida por el servidor debido un error de " "sintaxis." -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Acceso no autorizado al recurso" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "No tiene permiso para ver esta página" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "No se ha encontrado el recurso" -#: kallithea/controllers/error.py:109 -msgid "The server encountered an unexpected condition which prevented it from fulfilling the request." -msgstr "" -"La petición no se ha podido completar debido a que el servidor encontró un " -"problema inesperado." - -#: kallithea/controllers/feed.py:55 -#, fuzzy, python-format -msgid "Changes on %s repository" -msgstr "Cambios en %s repositorio" - -#: kallithea/controllers/feed.py:56 +#: kallithea/controllers/error.py:93 +msgid "" +"The server encountered an unexpected condition which prevented it from " +"fulfilling the request." +msgstr "" +"La petición no se ha podido completar debido a que el servidor encontró " +"un problema inesperado." + +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 +#: kallithea/templates/changeset/changeset.html:195 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 +msgid "Changeset was too big and was cut off..." +msgstr "El cambio era demasiado grande y se redució..." + +#: kallithea/controllers/feed.py:84 +#, python-format +msgid "%s committed on %s" +msgstr "%s anotó en %s" + +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 #, python-format msgid "%s %s feed" msgstr "%s%s canal" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 -msgid "Changeset was too big and was cut off..." -msgstr "El cambio era demasiado grande y se redució..." - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "%s anotó en %s" - -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 +#, fuzzy, python-format +msgid "Changes on %s repository" +msgstr "Cambios en %s repositorio" + +#: kallithea/controllers/files.py:93 msgid "Click here to add new file" msgstr "Haga clic aquí para añadir un archivo nuevo" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "Aún no hay archivos. %s" -#: kallithea/controllers/files.py:194 +#: kallithea/controllers/files.py:191 #, python-format msgid "%s at %s" msgstr "%s en %s" -#: kallithea/controllers/files.py:306 kallithea/controllers/files.py:366 -#: kallithea/controllers/files.py:433 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Este repositorio ha sido bloqueado por %s en %s" -#: kallithea/controllers/files.py:318 +#: kallithea/controllers/files.py:309 msgid "You can only delete files with revision being a valid branch" msgstr "Sólo puede borrar archivos si la revisión pertenece a una rama válida" -#: kallithea/controllers/files.py:329 +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Archivo %s eliminado mediante Kallithea" -#: kallithea/controllers/files.py:351 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "El archivo %s se eliminó correctamente" -#: kallithea/controllers/files.py:355 kallithea/controllers/files.py:421 -#: kallithea/controllers/files.py:502 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "Ocurrió un error al anotar los cambios" -#: kallithea/controllers/files.py:378 +#: kallithea/controllers/files.py:369 msgid "You can only edit files with revision being a valid branch" msgstr "Sólo puede editar archivos si la revisión pertenece a una rama válida" -#: kallithea/controllers/files.py:392 +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "Archivo %s editado mediante Kallithea" -#: kallithea/controllers/files.py:408 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "No hay cambios" -#: kallithea/controllers/files.py:417 kallithea/controllers/files.py:491 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "Anotado correctamente a %s" -#: kallithea/controllers/files.py:444 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "Archivo añadido mediante Kallithea" -#: kallithea/controllers/files.py:465 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "Sin contenido" -#: kallithea/controllers/files.py:469 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "Sin nombre de archivo" -#: kallithea/controllers/files.py:494 +#: kallithea/controllers/files.py:485 #, fuzzy msgid "Location must be relative path and must not contain .. in path" msgstr "La ruta debe ser relativa y no debe contener .. en la ruta" -#: kallithea/controllers/files.py:527 +#: kallithea/controllers/files.py:517 msgid "Downloads disabled" msgstr "Descargas deshabilitadas" -#: kallithea/controllers/files.py:538 +#: kallithea/controllers/files.py:528 #, python-format msgid "Unknown revision %s" msgstr "Revisión desconocida %s" -#: kallithea/controllers/files.py:540 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "Repositorio vacío" -#: kallithea/controllers/files.py:542 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "Tipo de archivo desconocido" -#: kallithea/controllers/files.py:772 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "Cambios" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "Ramas" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "Etiquetas" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "Ocurrió un error mientras se bifurcaba el repositorio %s" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "Grupos" -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:479 -#: kallithea/templates/base/base.html:653 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "Repositorios" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "Rama" -#: kallithea/controllers/home.py:136 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "Ramas cerradas" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "Etiqueta" -#: kallithea/controllers/home.py:148 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "Marcador" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "Registro público" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:306 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "Registro" -#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 msgid "Bad captcha" msgstr "CAPTCHA erróneo" -#: kallithea/controllers/login.py:150 +#: kallithea/controllers/login.py:148 +#, python-format msgid "You have successfully registered with %s" msgstr "El registro en %s se ha efectuado correctamente" -#: kallithea/controllers/login.py:195 +#: kallithea/controllers/login.py:193 msgid "A password reset confirmation code has been sent" msgstr "Se ha enviado una confirmación de restauración de contraseña" -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:242 msgid "Invalid password reset token" msgstr "Señal de restauración de contraseña inválida" -#: kallithea/controllers/login.py:249 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "Contraseña actualizada correctamente" -#: kallithea/controllers/pullrequests.py:123 -#, python-format -msgid "%s (closed)" -msgstr "%s (cerrado)" - -#: kallithea/controllers/pullrequests.py:151 -#: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 -msgid "Changeset" -msgstr "Cambio" - -#: kallithea/controllers/pullrequests.py:172 -msgid "Special" -msgstr "Especial" - -#: kallithea/controllers/pullrequests.py:173 -#, fuzzy -msgid "Peer branches" -msgstr "Ramas de los pares" - -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 -msgid "Bookmarks" -msgstr "Marcadores" - -#: kallithea/controllers/pullrequests.py:309 -#, python-format -msgid "Error creating pull request: %s" -msgstr "Error al crear la petición de pull: %s" - -#: kallithea/controllers/pullrequests.py:355 -#: kallithea/controllers/pullrequests.py:502 -msgid "No description" -msgstr "No hay descripción" - -#: kallithea/controllers/pullrequests.py:362 -msgid "Successfully opened new pull request" -msgstr "La petición de pull se ha creado correctamente" - -#: kallithea/controllers/pullrequests.py:365 -#: kallithea/controllers/pullrequests.py:452 -#: kallithea/controllers/pullrequests.py:509 +#: kallithea/controllers/pullrequests.py:73 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "El validador \"%s\" no es correcto" -#: kallithea/controllers/pullrequests.py:368 -#: kallithea/controllers/pullrequests.py:455 +#: kallithea/controllers/pullrequests.py:135 +#, python-format +msgid "%s (closed)" +msgstr "%s (cerrado)" + +#: kallithea/controllers/pullrequests.py:162 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 +msgid "Changeset" +msgstr "Cambio" + +#: kallithea/controllers/pullrequests.py:183 +msgid "Special" +msgstr "Especial" + +#: kallithea/controllers/pullrequests.py:184 +#, fuzzy +msgid "Peer branches" +msgstr "Ramas de los pares" + +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 +msgid "Bookmarks" +msgstr "Marcadores" + +#: kallithea/controllers/pullrequests.py:326 +#, python-format +msgid "Error creating pull request: %s" +msgstr "Error al crear la petición de pull: %s" + +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 msgid "Error occurred while creating pull request" msgstr "Ocurrió un error al crear la petición de pull" -#: kallithea/controllers/pullrequests.py:400 -msgid "Missing changesets since the previous pull request:" -msgstr "Cambios que faltan desde la ultima petición de pull:" - -#: kallithea/controllers/pullrequests.py:407 -#, fuzzy, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "Cambios nuevos en %s %s desde la ultima petición pull:" +#: kallithea/controllers/pullrequests.py:358 +msgid "Successfully opened new pull request" +msgstr "La petición de pull se ha creado correctamente" + +#: kallithea/controllers/pullrequests.py:381 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" +msgstr "Actualización de la petición pull creada" + +#: kallithea/controllers/pullrequests.py:410 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" #: kallithea/controllers/pullrequests.py:414 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" -"El ascendente no ha cambiado - ver diferencias desde la versión anterior:" - -#: kallithea/controllers/pullrequests.py:421 -#, python-format -msgid "This pull request is based on another %s revision and there is no simple diff." -msgstr "" -"La petición de pull está basada en otra %s revisión y no hay un diff simple." - -#: kallithea/controllers/pullrequests.py:423 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "No se encontró ningún cambio en %s %s desde la versión anterior." - -#: kallithea/controllers/pullrequests.py:461 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "Cerrado, reemplazado por %s." - -#: kallithea/controllers/pullrequests.py:469 -msgid "Pull request update created" -msgstr "Actualización de la petición pull creada" - -#: kallithea/controllers/pullrequests.py:513 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "No hay descripción" + +#: kallithea/controllers/pullrequests.py:439 msgid "Pull request updated" msgstr "Petición pull actualizada" -#: kallithea/controllers/pullrequests.py:528 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "Petición pull eliminada correctamente" -#: kallithea/controllers/pullrequests.py:594 +#: kallithea/controllers/pullrequests.py:491 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "No se encontraron cambios para actualizar la petición pull." + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "La petición pull ya ha sido incluida a %s." -#: kallithea/controllers/pullrequests.py:596 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "La petición pull esta cerrada y no se puede actualizar." -#: kallithea/controllers/pullrequests.py:614 -#, python-format -msgid "The following changes are available on %s:" +#: kallithea/controllers/pullrequests.py:552 +#, fuzzy, python-format +#| msgid "The following changes are available on %s:" +msgid "The following additional changes are available on %s:" msgstr "Los siguientes cambios están disponibles en %s:" -#: kallithea/controllers/pullrequests.py:618 -msgid "No changesets found for updating this pull request." +#: kallithea/controllers/pullrequests.py:556 +#, fuzzy +#| msgid "No changesets found for updating this pull request." +msgid "No additional changesets found for iterating on this pull request." msgstr "No se encontraron cambios para actualizar la petición pull." -#: kallithea/controllers/pullrequests.py:626 +#: kallithea/controllers/pullrequests.py:564 #, fuzzy, python-format msgid "Note: Branch %s has another head: %s." msgstr "Nota: la rama %s tiene otro head: %s." -#: kallithea/controllers/pullrequests.py:632 -msgid "Git pull requests don't support updates yet." +#: kallithea/controllers/pullrequests.py:571 +#, fuzzy +#| msgid "Git pull requests don't support updates yet." +msgid "Git pull requests don't support iterating yet." msgstr "La peticiones pull de Git aún no soportan actualizaciones." -#: kallithea/controllers/pullrequests.py:724 +#: kallithea/controllers/pullrequests.py:573 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "No se encontraron cambios para actualizar la petición pull." + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 msgid "No permission to change pull request status" msgstr "No tene permiso para cambiar el estado de la petición pull" -#: kallithea/controllers/pullrequests.py:735 +#: kallithea/controllers/pullrequests.py:676 #, python-format msgid "Successfully deleted pull request %s" msgstr "Petición de pull %s eliminada correctamente" -#: kallithea/controllers/pullrequests.py:745 -msgid "Closing." -msgstr "Cerrado." - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "Consulta de búsqueda inválida. Inténtelo entre comillas." -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" -msgstr "" -"No hay ningún indice para buscar. Por favor, ejecute el indexador whoosh" - -#: kallithea/controllers/search.py:144 +msgstr "No hay ningún indice para buscar. Por favor, ejecute el indexador whoosh" + +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Ocurrió un error mientras se ejecutaba la búsqueda." -#: kallithea/controllers/summary.py:181 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 msgid "No data ready yet" msgstr "Todavía no hay datos disponibles" -#: kallithea/controllers/summary.py:184 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "Las estadísticas están deshabilitadas en este repositorio" @@ -475,149 +519,153 @@ msgid "error occurred during update of auth settings" msgstr "ocurrió un error al actualizar los ajustes de autentificación" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "Los ajustes predeterminados se han actualizado correctamente" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "Ocurrió un error al actualizar los ajustes predeterminados" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 msgid "Forever" msgstr "Para siempre" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "5 minutes" msgstr "5 minutos" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 hour" msgstr "1 hora" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 msgid "1 day" msgstr "1 día" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "1 mes" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:290 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "Tiempo de vida" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "Ocurrió un error mientras se creaba el gist" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "Gist %s eliminado" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:200 msgid "Unmodified" msgstr "Sin modificar" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "Gist actualizado correctamente" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:201 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:324 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" msgstr "" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -625,1883 +673,1609 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:336 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:344 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1707 -msgid "Manual activation of external account" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1708 -msgid "Automatic activation of external account" -msgstr "" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:187 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:192 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:249 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "" +#: kallithea/controllers/admin/repo_groups.py:248 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:258 +#, python-format +msgid "This group contains %s repositories and cannot be deleted" +msgstr "" + #: kallithea/controllers/admin/repo_groups.py:265 #, python-format -msgid "Error occurred during update of repository group %s" -msgstr "" - -#: kallithea/controllers/admin/repo_groups.py:283 -#, python-format -msgid "This group contains %s repositories and cannot be deleted" -msgstr "" - -#: kallithea/controllers/admin/repo_groups.py:290 -#, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:296 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:301 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:404 -#: kallithea/controllers/admin/repo_groups.py:439 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:456 -#: kallithea/controllers/admin/repos.py:397 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:151 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:212 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:221 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:224 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:261 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:309 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:312 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:317 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:320 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:325 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:373 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:429 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:443 +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, fuzzy, python-format +#| msgid "An error occurred during repository forking %s" +msgid "An error occurred during creation of field: %r" +msgstr "Ocurrió un error mientras se bifurcaba el repositorio %s" + +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:459 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:490 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:511 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "" -#: kallithea/controllers/admin/repos.py:513 +#: kallithea/controllers/admin/repos.py:473 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:480 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:536 -#: kallithea/controllers/admin/repos.py:563 +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 msgid "Repository has been locked" msgstr "" -#: kallithea/controllers/admin/repos.py:539 -#: kallithea/controllers/admin/repos.py:560 +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 msgid "Repository has been unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:542 -#: kallithea/controllers/admin/repos.py:567 +#: kallithea/controllers/admin/repos.py:502 +#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:533 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:585 +#: kallithea/controllers/admin/repos.py:537 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:603 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:636 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "" +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 +msgid "" +"Unable to activate hgsubversion support. The \"hgsubversion\" library is " +"missing" +msgstr "" + #: kallithea/controllers/admin/settings.py:145 -msgid "Unable to activate hgsubversion support. The \"hgsubversion\" library is missing" -msgstr "" - -#: kallithea/controllers/admin/settings.py:151 -#: kallithea/controllers/admin/settings.py:248 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:187 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:244 +#: kallithea/controllers/admin/settings.py:189 +#, python-format +msgid "Invalidated %s repositories" +msgstr "" + +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:301 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:306 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:347 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:378 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:392 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:396 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:208 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:219 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:224 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:242 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:217 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:222 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:235 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:462 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:468 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:482 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:737 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:750 +#: kallithea/lib/auth.py:829 +msgid "You need to be a registered user to perform this action" +msgstr "" + +#: kallithea/lib/auth.py:857 +msgid "You need to be signed in to view this page" +msgstr "" + +#: kallithea/lib/base.py:449 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:768 +#: kallithea/lib/base.py:508 msgid "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/auth.py:813 -msgid "You need to be a registered user to perform this action" -msgstr "" - -#: kallithea/lib/auth.py:843 -msgid "You need to be signed in to view this page" -msgstr "" - -#: kallithea/lib/base.py:493 +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:618 -msgid "Changeset not found" -msgstr "" - -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/base.py:617 +#, python-format +msgid "Changeset for %s %s not found in %s" +msgstr "" + +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:605 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:607 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:667 +#: kallithea/lib/helpers.py:613 +#, python-format +msgid "Changeset %s not found" +msgstr "" + +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:673 +#: kallithea/lib/helpers.py:668 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:692 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:693 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:694 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:718 +#: kallithea/lib/helpers.py:713 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:738 +#: kallithea/lib/helpers.py:734 #, python-format msgid "Pull request %s" msgstr "" +#: kallithea/lib/helpers.py:744 +msgid "[deleted] repository" +msgstr "" + +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 +msgid "[created] repository" +msgstr "" + #: kallithea/lib/helpers.py:748 -msgid "[deleted] repository" -msgstr "" - -#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:762 -msgid "[created] repository" -msgstr "" - -#: kallithea/lib/helpers.py:752 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:754 kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:756 kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:758 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "" +#: kallithea/lib/helpers.py:764 +msgid "[created] user" +msgstr "" + +#: kallithea/lib/helpers.py:766 +msgid "[updated] user" +msgstr "" + #: kallithea/lib/helpers.py:768 -msgid "[created] user" +msgid "[created] user group" msgstr "" #: kallithea/lib/helpers.py:770 -msgid "[updated] user" +msgid "[updated] user group" msgstr "" #: kallithea/lib/helpers.py:772 -msgid "[created] user group" +msgid "[commented] on revision in repository" msgstr "" #: kallithea/lib/helpers.py:774 -msgid "[updated] user group" +msgid "[commented] on pull request for" msgstr "" #: kallithea/lib/helpers.py:776 -msgid "[commented] on revision in repository" +msgid "[closed] pull request for" msgstr "" #: kallithea/lib/helpers.py:778 -msgid "[commented] on pull request for" +msgid "[pushed] into" msgstr "" #: kallithea/lib/helpers.py:780 -msgid "[closed] pull request for" +msgid "[committed via Kallithea] into repository" msgstr "" #: kallithea/lib/helpers.py:782 -msgid "[pushed] into" +msgid "[pulled from remote] into repository" msgstr "" #: kallithea/lib/helpers.py:784 -msgid "[committed via Kallithea] into repository" +msgid "[pulled] from" msgstr "" #: kallithea/lib/helpers.py:786 -msgid "[pulled from remote] into repository" +msgid "[started following] repository" msgstr "" #: kallithea/lib/helpers.py:788 -msgid "[pulled] from" -msgstr "" - -#: kallithea/lib/helpers.py:790 -msgid "[started following] repository" -msgstr "" - -#: kallithea/lib/helpers.py:792 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1119 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1123 -#: kallithea/templates/compare/compare_diff.html:71 -#: kallithea/templates/pullrequests/pullrequest_show.html:337 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1189 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1192 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1464 -#, python-format -msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories" -msgstr "" - -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/helpers.py:1230 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" + +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:435 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:437 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:439 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:455 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:457 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:459 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:462 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:465 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1671 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2238 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2239 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1520 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1703 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1697 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1698 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1715 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1717 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1718 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1675 +#: kallithea/model/db.py:1719 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1720 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1722 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1723 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1724 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1725 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1727 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1728 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1685 +#: kallithea/model/db.py:1729 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1730 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1688 +#: kallithea/model/db.py:1732 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1733 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1691 +#: kallithea/model/db.py:1735 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1692 +#: kallithea/model/db.py:1736 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1694 +#: kallithea/model/db.py:1738 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1739 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1741 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1742 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1744 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1701 +#: kallithea/model/db.py:1745 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1704 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1748 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1705 +#: kallithea/model/db.py:1749 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2237 +#: kallithea/model/db.py:2276 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2240 +#: kallithea/model/db.py:2277 msgid "Under review" msgstr "" -#: kallithea/model/forms.py:57 -msgid "Please enter a login" +#: kallithea/model/db.py:2278 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2279 +msgid "Approved" msgstr "" #: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 -msgid "Please enter a password" -msgstr "" - #: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:165 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "" +#: kallithea/model/notification.py:240 +#, python-format +msgid "%(user)s commented on changeset %(age)s" +msgstr "" + +#: kallithea/model/notification.py:241 +#, python-format +msgid "%(user)s sent message %(age)s" +msgstr "" + +#: kallithea/model/notification.py:242 +#, python-format +msgid "%(user)s mentioned you %(age)s" +msgstr "" + +#: kallithea/model/notification.py:243 +#, python-format +msgid "%(user)s registered in Kallithea %(age)s" +msgstr "" + +#: kallithea/model/notification.py:244 +#, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:245 +#, python-format +msgid "%(user)s commented on pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:252 +#, python-format +msgid "%(user)s commented on changeset at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:253 +#, python-format +msgid "%(user)s sent message at %(when)s" +msgstr "" + #: kallithea/model/notification.py:254 #, python-format -msgid "%(user)s commented on changeset %(age)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:255 #, python-format -msgid "%(user)s sent message %(age)s" +msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" #: kallithea/model/notification.py:256 #, python-format -msgid "%(user)s mentioned you %(age)s" +msgid "%(user)s opened new pull request at %(when)s" msgstr "" #: kallithea/model/notification.py:257 #, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:266 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:302 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:288 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" + +#: kallithea/model/notification.py:291 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:293 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:307 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:321 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:812 +#: kallithea/model/pull_request.py:211 +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Cannot create empty pull request" +msgstr "Error al crear la petición de pull: %s" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +#, fuzzy +#| msgid "Missing changesets since the previous pull request:" +msgid "Missing changesets since the previous iteration:" +msgstr "Cambios que faltan desde la ultima petición de pull:" + +#: kallithea/model/pull_request.py:348 +#, fuzzy, python-format +#| msgid "New changesets on %s %s since the previous pull request:" +msgid "New changesets on %s %s since the previous iteration:" +msgstr "Cambios nuevos en %s %s desde la ultima petición pull:" + +#: kallithea/model/pull_request.py:355 +#, fuzzy +#| msgid "Ancestor didn't change - show diff since previous version:" +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "El ascendente no ha cambiado - ver diferencias desde la versión anterior:" + +#: kallithea/model/pull_request.py:362 +#, fuzzy, python-format +#| msgid "" "This pull request is based on another %s revision and there is no +#| simple " "diff." +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" +"La petición de pull está basada en otra %s revisión y no hay un diff " +"simple." + +#: kallithea/model/pull_request.py:364 +#, fuzzy, python-format +#| msgid "No changes found on %s %s since previous version." +msgid "No changes found on %s %s since previous iteration." +msgstr "No se encontró ningún cambio en %s %s desde la versión anterior." + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:261 -#, python-format -msgid "User \"%s\" still owns %s repositories and cannot be removed. Switch owners or remove those repositories: %s" -msgstr "" - -#: kallithea/model/user.py:266 -#, python-format -msgid "User \"%s\" still owns %s repository groups and cannot be removed. Switch owners or remove those repository groups: %s" -msgstr "" - -#: kallithea/model/user.py:273 -#, python-format -msgid "User \"%s\" still owns %s user groups and cannot be removed. Switch owners or remove those user groups: %s" -msgstr "" - -#: kallithea/model/user.py:368 +#: kallithea/model/user.py:258 +#, python-format +msgid "" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "" + +#: kallithea/model/user.py:263 +#, python-format +msgid "" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch" +" owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:270 +#, python-format +msgid "" +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "" + +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:418 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:419 -#, python-format -msgid "The password to your account %s has been changed using password reset form." -msgstr "" - -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/user.py:414 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." +msgstr "" + +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:96 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:98 +#: kallithea/model/validators.py:75 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:100 -msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with an alphanumeric character or underscore" -msgstr "" - -#: kallithea/model/validators.py:127 +#: kallithea/model/validators.py:77 +msgid "" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with an alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:111 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + +#: kallithea/model/validators.py:131 +msgid "Invalid user group name" +msgstr "" + +#: kallithea/model/validators.py:132 +#, python-format +msgid "User group \"%(usergroup)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:134 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:154 -msgid "Invalid user group name" -msgstr "" - -#: kallithea/model/validators.py:155 -#, python-format -msgid "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:157 -msgid "user group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character" -msgstr "" - -#: kallithea/model/validators.py:197 +msgid "" +"user group name may only contain alphanumeric characters underscores, " +"periods or dashes and must begin with alphanumeric character" +msgstr "" + +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:198 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:200 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:258 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:273 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:289 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:304 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:335 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "" -#: kallithea/model/validators.py:351 +#: kallithea/model/validators.py:326 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:353 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:354 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:356 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:470 +#: kallithea/model/validators.py:449 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:471 -msgid "Invalid repository URL. It must be a valid http, https, ssh, svn+http or svn+https URL" -msgstr "" - -#: kallithea/model/validators.py:496 +#: kallithea/model/validators.py:450 +msgid "" +"Invalid repository URL. It must be a valid http, https, ssh, svn+http or " +"svn+https URL" +msgstr "" + +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:511 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:513 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:563 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:604 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:697 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:714 +#: kallithea/model/validators.py:692 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:712 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:771 -msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to \"username\"" -msgstr "" - -#: kallithea/model/validators.py:783 +#: kallithea/model/validators.py:749 +msgid "" +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" +msgstr "" + +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:784 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:831 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:847 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +#, fuzzy +#| msgid "Empty repository" +msgid "Repository Group" +msgstr "Repositorio vacío" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:132 +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:244 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:414 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 #, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 msgid "Reset Your Password" msgstr "" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 msgid "Send Password Reset Email" msgstr "" -#: kallithea/templates/password_reset.html:47 -msgid "A password reset link will be sent to the specified email address if it is registered in the system." -msgstr "" - -#: kallithea/templates/password_reset_confirmation.html:19 -#, python-format -msgid "You are about to set a new password for the email address %s." +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 +msgid "" +"A password reset link will be sent to the specified email address if it " +"is registered in the system." msgstr "" #: kallithea/templates/password_reset_confirmation.html:20 -msgid "Note that you must use the same browser session for this as the one used to request the password reset." -msgstr "" - -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 msgid "New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 msgid "Confirm New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 msgid "Admin Journal" msgstr "" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2509,144 +2283,176 @@ msgstr[1] "" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 -msgid "Comma-separated list of plugins; Kallithea will try user authentication in plugin order" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 +msgid "" +"Comma-separated list of plugins; Kallithea will try user authentication " +"in plugin order" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 msgid "Repository Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "" +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 -msgid "Private repository" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 -msgid "Private repositories are only visible to people explicitly added as collaborators." +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 +msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 +msgid "Enable download menu on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 +msgid "Enable locking" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:61 #: kallithea/templates/admin/repos/repo_edit_settings.html:84 -msgid "Enable statistics" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 -msgid "Enable statistics window on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 -msgid "Enable downloads" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 -msgid "Enable download menu on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2655,314 +2461,469 @@ msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 -#, python-format -msgid "Gist was update since you started editing. Copy your changes and click %(here)s to reload new version." -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:35 +#, python-format +msgid "" +"Gist was update since you started editing. Copy your changes and click " +"%(here)s to reload new version." +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 msgid "Never" msgstr "" +#: kallithea/templates/admin/gists/edit.html:145 +msgid "Update Gist" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:146 -msgid "Update Gist" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:147 -#: kallithea/templates/changeset/changeset_file_comment.html:105 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, python-format msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, python-format msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:31 -#: kallithea/templates/changeset/changeset_file_comment.html:95 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:431 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 msgid "Owned Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 msgid "Watched Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 msgid "Show Permissions" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, python-format msgid "Confirm to reset this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, python-format msgid "Confirm to remove this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 msgid "Remove" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "" @@ -2970,263 +2931,359 @@ msgid "Change Your Account Password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 msgid "Repositories You Own" msgstr "" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 msgid "Repositories You are Watching" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 msgid "Mark All Read" msgstr "" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +msgid "Mark as read" +msgstr "" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 msgid "Show Notification" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:430 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 msgid "Default Permissions" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 -#, python-format -msgid "Allow access to Kallithea without needing to log in. Anonymous users use %s user permissions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:25 -msgid "All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost" +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 +#, python-format +msgid "" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 +msgid "" +"All default permissions on each repository will be reset to chosen " +"permission, note that all custom default permission on repositories will " +"be lost" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 +msgid "Apply to all existing repositories" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 +msgid "Permissions for the Default user on new repositories." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:26 -msgid "Apply to all existing repositories" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:27 -msgid "Permissions for the Default user on new repositories." +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 +msgid "Repository group" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 +msgid "" +"All default permissions on each repository group will be reset to chosen " +"permission, note that all custom default permission on repository groups " +"will be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 +msgid "Apply to all existing repository groups" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 +msgid "Permissions for the Default user on new repository groups." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:39 -msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:40 -msgid "Apply to all existing repository groups" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:41 -msgid "Permissions for the Default user on new repository groups." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 -msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 +msgid "" +"All default permissions on each user group will be reset to chosen " +"permission, note that all custom default permission on user groups will " +"be lost" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 +msgid "Permissions for the Default user on new user groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 +msgid "Top level repository creation" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:55 -msgid "Permissions for the Default user on new user groups." +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 +msgid "Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 +msgid "" +"Note: This will also give all users API access to create repositories " +"everywhere. That might change in future versions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:60 -msgid "Top level repository creation" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 -msgid "Note: This will also give all users API access to create repositories everywhere. That might change in future versions." +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 +msgid "Repository creation with group write access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 +msgid "" +"With this, write permission to a repository group allows creating " +"repositories inside that group. Without this, group write permissions " +"mean nothing." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 +msgid "User group creation" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:70 -msgid "Repository creation with group write access" +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 +msgid "Enable this to allow non-admins to create user groups." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:74 -msgid "With this, write permission to a repository group allows creating repositories inside that group. Without this, group write permissions mean nothing." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:79 -msgid "User group creation" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:83 -msgid "Enable this to allow non-admins to create user groups." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, python-format msgid "Confirm to delete this IP address: %s" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "" @@ -3235,31 +3292,42 @@ msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "" @@ -3283,12 +3351,14 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3299,16 +3369,34 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "No response" +msgid "Add repos" +msgstr "No hay respuesta" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3316,96 +3404,117 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 -msgid "Set or revoke permission to all children of that group, including non-private repositories and other groups if selected." -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 -msgid "Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 +msgid "" +"Set or revoke permission to all children of that group, including non-" +"private repositories and other groups if selected." +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 +msgid "" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" +#, fuzzy, python-format +#| msgid "This repository has %s fork" +#| msgid_plural "This repository has %s forks" +msgid "Repository group %s" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 msgid "Repository Groups Administration" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:22 -msgid "Optional: URL of a remote repository. If set, the repository will be created as a clone from this URL." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 +msgid "" +"Optional: URL of a remote repository. If set, the repository will be " +"created as a clone from this URL." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 -msgid "Default revision for files page, downloads, full text search index and readme generation" +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 +msgid "" +"Default revision for files page, downloads, full text search index and " +"readme generation" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:9 @@ -3419,257 +3528,315 @@ #: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format -msgid "Repository \"%(repo_name)s\" is being created, you will be redirected when this process is finished.repo_name" +msgid "" +"Repository \"%(repo_name)s\" is being created, you will be redirected " +"when this process is finished.repo_name" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:39 -msgid "We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator." +msgid "" +"We're sorry but error occurred during this operation. Please check your " +"Kallithea server logs, or contact administrator." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 msgid "Parent" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 msgid "Public Journal Visibility" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 msgid "Add to Public Journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 -msgid "All actions done in this repository will be visible to everyone in the public journal." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 +msgid "" +"All actions done in this repository will be visible to everyone in the " +"public journal." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 msgid "Change Locking" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 +msgid "Unlock Repository" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 -msgid "Unlock Repository" +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 +#, python-format +msgid "Locked by %s on %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, python-format -msgid "Locked by %s on %s" +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 +msgid "Lock Repository" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 -msgid "Force locking on the repository. Works only when anonymous access is disabled. Triggering a pull locks the repository. The user who is pulling locks the repository; only the user who pulled and locked it can unlock it by doing a push." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 +msgid "" +"Force locking on the repository. Works only when anonymous access is " +"disabled. Triggering a pull locks the repository. The user who is " +"pulling locks the repository; only the user who pulled and locked it can " +"unlock it by doing a push." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 msgid "Delete this Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 -msgid "The deleted repository will be moved away and hidden until the administrator expires it. The administrator can both permanently delete it or restore it." +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 +msgid "" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 msgid "Invalidate Repository Cache" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 -msgid "Manually invalidate cache for this repository. On first access, the repository will be cached again." +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 +msgid "" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 msgid "Private Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "Empty repository" +msgid "Fork of repository" +msgstr "Repositorio vacío" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 msgid "Remote repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 -msgid "Confirm to pull changes from remote repository." -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" -"In case this repository is renamed or moved into another group the repository URL changes.\n" -" Using the above permanent URL guarantees that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any other cases that you need to hardcode the URL into a 3rd party service." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +"In case this repository is renamed or moved into another group the " +"repository URL changes.\n" +" Using the above permanent URL guarantees " +"that this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any " +"other cases that you need to hardcode the URL into a 3rd party service." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 -msgid "Optional: URL of a remote repository. If set, the repository can be pulled from this URL." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "" +"Optional: URL of a remote repository. If set, the repository can be " +"pulled from this URL." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3682,381 +3849,506 @@ msgstr "" #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 msgid "Repositories Administration" msgstr "" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 msgid "Settings Administration" msgstr "" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 -msgid "HTML with JavaScript for web analytics systems like Google Analytics or Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 +msgid "" +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems like Google" +" Analytics or Piwik, but also to perform " +"instance-specific customizations like adding a " +"project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 -msgid "Private key for reCaptcha system. Setting this value will enable captcha on registration." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 +msgid "" +"Private key for reCaptcha system. Setting this value will enable captcha " +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 msgid "Save Settings" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 -msgid "Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications." +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 +msgid "" +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 -msgid "Check this option to remove all comments, pull requests and other records related to repositories that no longer exist in the filesystem." +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 +msgid "" +"Check this option to remove all comments, pull requests and other records" +" related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "Verify if Kallithea's Git hooks are installed for each repository. Current hooks will be updated to the latest version." +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 +msgid "" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 -msgid "If installing Git hooks, overwrite any existing hooks, even if they do not seem to come from Kallithea. WARNING: This operation will destroy any custom git hooks you may have deployed by hand!" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any" +" custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 -msgid "This option completely reindexeses all of the repositories for proper fulltext search capabilities." -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 +msgid "" +"This option completely reindexeses all of the repositories for proper " +"fulltext search capabilities." +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "Activate to require SSL both pushing and pulling. If SSL certificate is missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 msgid "Mercurial extensions" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 +msgid "Enable hgsubversion extension" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:47 -msgid "Enable largefiles extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:51 -msgid "Enable hgsubversion extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:53 -msgid "Requires hgsubversion library to be installed. Enables cloning of remote Subversion repositories while converting them to Mercurial." +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 +msgid "" +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 +msgid "Location of repositories" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Location of repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:69 -msgid "Click to unlock. You must restart Kallithea in order to make this setting take effect." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:72 -msgid "Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 +msgid "" +"Click to unlock. You must restart Kallithea in order to make this setting" +" take effect." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 +msgid "" +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 msgid "" "Gravatar URL allows you to use another avatar server application.\n" -" The following variables of the URL will be replaced accordingly.\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {email} user email,\n" -" {md5email} md5 hash of the user email (like at gravatar.com),\n" -" {size} size of the image that is expected from the server application,\n" -" {netloc} network location/server host of running Kallithea server" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:42 +" The following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" +" {email} user " +"email,\n" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.\n" -" The following variables are available:\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {user} current user username,\n" -" {netloc} network location/server host of running Kallithea server,\n" -" {repo} full repository name,\n" -" {repoid} ID of repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 -msgid "Number of items displayed in the main page dashboard before pagination is shown." +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." +"\n" +" The following " +"variables are available:\n" +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user" +" username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repositories" +msgid "Repository page size" +msgstr "Repositorios" + +#: kallithea/templates/admin/settings/settings_visual.html:57 +msgid "" +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -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." +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 +msgid "" +"Number of items displayed in the admin pages grids before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 +msgid "Icons" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:75 -msgid "Icons" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:97 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 +msgid "" +"Parses meta tags from the repository description field and turns them " +"into colored tags." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:111 -msgid "Parses meta tags from the repository description field and turns them into colored tags." -msgstr "" - #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 msgid "Show Members" msgstr "" @@ -4066,13 +4358,15 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4081,48 +4375,59 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 msgid "User Groups Administration" msgstr "" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "" @@ -4132,12 +4437,14 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "" @@ -4146,7 +4453,8 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4155,710 +4463,877 @@ msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 msgid "Users Administration" msgstr "" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:142 -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:147 +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:154 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:331 +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:155 +#: kallithea/tests/data/templates/base/base.html.py:399 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:157 +#: kallithea/tests/data/templates/base/base.html.py:405 msgid "Lock" msgstr "" +#: kallithea/templates/base/base.html:165 +#: kallithea/tests/data/templates/base/base.html.py:413 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 +msgid "Fork" +msgstr "" + #: kallithea/templates/base/base.html:170 -msgid "Follow" -msgstr "" - -#: kallithea/templates/base/base.html:171 -msgid "Unfollow" -msgstr "" - -#: kallithea/templates/base/base.html:174 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 +msgid "Create Pull Request" msgstr "" #: kallithea/templates/base/base.html:175 -#: kallithea/templates/pullrequests/pullrequest.html:88 -msgid "Create Pull Request" -msgstr "" - -#: kallithea/templates/base/base.html:180 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:485 +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:305 +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "" +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 +msgid "Gists" +msgstr "" + #: kallithea/templates/base/base.html:311 -#: kallithea/templates/base/base.html:312 -msgid "Public journal" -msgstr "" - -#: kallithea/templates/base/base.html:317 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:318 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:322 +#: kallithea/tests/data/templates/base/base.html.py:525 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:330 +#: kallithea/templates/base/base.html:319 +#: kallithea/tests/data/templates/base/base.html.py:540 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:353 -#: kallithea/templates/base/base.html:354 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:377 +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:384 +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 msgid "Login to Your Account" msgstr "" +#: kallithea/templates/base/base.html:385 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:389 +msgid "Don't have an account?" +msgstr "" + #: kallithea/templates/base/base.html:407 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:434 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:615 -msgid "Keyboard shortcuts" -msgstr "" - -#: kallithea/templates/base/base.html:624 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 msgid "Inherit defaults" msgstr "" -#: kallithea/templates/base/default_perms_box.html:19 -#, python-format -msgid "Select to inherit global settings, IP whitelist and permissions from the %s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 +#, python-format +msgid "" +"Select to inherit global settings, IP whitelist and permissions from the " +"%s." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -msgid "Add Another Comment" -msgstr "" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - #: kallithea/templates/base/root.html:25 -msgid "Group" +#: kallithea/tests/data/templates/base/root.html.py:85 +msgid "Add Another Comment" msgstr "" #: kallithea/templates/base/root.html:26 -msgid "members" +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:27 -msgid "Loading ..." +#: kallithea/tests/data/templates/base/root.html.py:89 +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:28 -msgid "loading ..." +#: kallithea/tests/data/templates/base/root.html.py:91 +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/tests/data/templates/base/root.html.py:93 +msgid "members" msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" +#: kallithea/tests/data/templates/base/root.html.py:95 +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:31 -msgid "Open New Pull Request from {0}" +#: kallithea/tests/data/templates/base/root.html.py:97 +msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" +#: kallithea/tests/data/templates/base/root.html.py:99 +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets {0} → {1}" +#: kallithea/tests/data/templates/base/root.html.py:101 +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" +#: kallithea/tests/data/templates/base/root.html.py:103 +msgid "Open New Pull Request from {0}" msgstr "" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -#: kallithea/templates/changeset/diff_block.html:21 -msgid "Collapse Diff" +#: kallithea/tests/data/templates/base/root.html.py:105 +msgid "Open New Pull Request for {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:36 -msgid "Expand Diff" +#: kallithea/tests/data/templates/base/root.html.py:107 +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" +#: kallithea/tests/data/templates/base/root.html.py:109 +msgid "Selection Link" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 +msgid "Collapse Diff" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" +#: kallithea/tests/data/templates/base/root.html.py:113 +msgid "Expand Diff" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/base/root.html.py:115 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "Seleccionar cambios" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 msgid "Specify changeset" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." msgstr "" #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 msgid "Go to tip of repository" msgstr "" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 #, python-format msgid "" -"Changeset status: %s\n" +"Changeset status: %s by %s\n" "Click to open associated pull request %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 +#, python-format +msgid "Changeset status: %s by %s" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 msgid "Expand commit message" msgstr "" -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/changelog/changelog.html:116 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "" -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#: kallithea/templates/compare/compare_cs.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:203 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:310 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:47 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:81 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 msgid "Push new repository" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:98 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:39 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:75 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 msgid "Merge" msgstr "" +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 +msgid "Grafted from:" +msgstr "" + #: kallithea/templates/changeset/changeset.html:123 -msgid "Grafted from:" +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 +msgid "Transplanted from:" msgstr "" #: kallithea/templates/changeset/changeset.html:129 -msgid "Transplanted from:" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:329 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:62 -#: kallithea/templates/pullrequests/pullrequest_show.html:331 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:231 -#: kallithea/templates/changeset/changeset.html:268 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 msgid "No revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 msgid "on pull request" msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 +msgid "No title" +msgstr "" + #: kallithea/templates/changeset/changeset_file_comment.html:22 -msgid "No title" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 msgid "on this changeset" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 msgid "Delete comment?" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 msgid "Status change" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:59 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 msgid "Commenting on line." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:60 -msgid "Comments are in plain text. Use @username inside this text to notify another user." +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 +msgid "" +"Comments are in plain text. Use @username inside this text to notify " +"another user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 +msgid "Set changeset status" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:67 -msgid "Set changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:69 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:75 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 msgid "No change" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 msgid "Finish pull request" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 msgid "Close" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 msgid "Submitting ..." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:104 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:116 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:129 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:130 +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 #, python-format msgid "%d general" msgid_plural "%d general" @@ -4866,210 +5341,341 @@ msgstr[1] "" #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "Sin modificar" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 msgid "Deleted" msgstr "" -#: kallithea/templates/changeset/diff_block.html:57 +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 msgid "Renamed" msgstr "" -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Revisión desconocida %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Sin nombre de archivo" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:69 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:83 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "" #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:85 +#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:321 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:99 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:107 +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:108 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, python-format msgid "%s changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:109 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 msgid "behind" msgstr "" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "" #: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "" #: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset" +msgid "Changeset on" +msgstr "Cambio" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Rama" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +msgid "Status change:" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "This pull request has been closed and can not be updated." +msgid "The pull request has been closed." +msgstr "La petición pull esta cerrada y no se puede actualizar." + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 -msgid "We have received a request to reset the password for your account." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:8 -msgid "This account is however managed outside this system and the password cannot be changed here." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:10 -msgid "To set a new password, click the following link" -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:13 -msgid "Should you not be able to use the link above, please type the following code into the password reset form" -msgstr "" - #: kallithea/templates/email_templates/password_reset.html:16 -msgid "If it weren't you who requested the password reset, just disregard this message." -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 +msgid "We have received a request to reset the password for your account." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 +msgid "To set a new password, click the following link" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "Pull request updated" +msgid "Pull request from" +msgstr "Petición pull actualizada" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +msgid "at" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 -#, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "Error al crear la petición de pull: %s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "Error al crear la petición de pull: %s" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" msgstr "" #: kallithea/templates/files/diff_2way.html:15 @@ -5088,82 +5694,104 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 +#: kallithea/tests/data/templates/files/files_add.html.py:241 msgid "New file type" msgstr "" -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 msgid "Commit Changes" msgstr "" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:62 -msgid "Last Revision" -msgstr "" - #: kallithea/templates/files/files_browser.html:63 -msgid "Last Modified" +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 +msgid "Size" msgstr "" #: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 msgid "Last Committer" msgstr "" @@ -5173,7 +5801,7 @@ msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5186,109 +5814,128 @@ msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "" -#: kallithea/templates/files/files_source.html:74 +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 msgid "File is too big to display." msgstr "" -#: kallithea/templates/files/files_source.html:76 +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 msgid "Show full annotation anyway." msgstr "" -#: kallithea/templates/files/files_source.html:78 +#: kallithea/templates/files/files_source.html:73 +#: kallithea/tests/data/templates/files/files_source.html.py:133 msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "" @@ -5297,70 +5944,80 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 -msgid "ATOM journal feed" -msgstr "" - #: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "" @@ -5374,34 +6031,45 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "" @@ -5436,7 +6104,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "" @@ -5454,113 +6124,150 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, python-format msgid "%s Pull Request %s" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, python-format msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 msgid "There are no reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 msgid "on" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 -msgid "This is just a range of changesets and doesn't have a target or a real merge ancestor." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:215 -msgid "Pull requests do not change once created. Select a revision and save to replace this pull request with a new one." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:224 +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision and save to make a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +msgid "Cancel Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 msgid "Pull Request Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:249 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 msgid "Remove reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:269 +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 msgid "Potential Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:272 +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:295 -msgid "Save Changes" +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 +msgid "Pull Request Content" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:296 -msgid "Save Updates as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:297 -msgid "Cancel Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:307 -msgid "Pull Request Content" +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +msgid "Common ancestor" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 @@ -5578,237 +6285,669 @@ msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 msgid "Search in All Repositories" msgstr "" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "" +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "" + #: kallithea/templates/summary/statistics.html:390 -msgid "commits" +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" msgstr "" #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" +#: kallithea/tests/data/templates/summary/statistics.html.py:153 +msgid "files removed" msgstr "" #: kallithea/templates/summary/statistics.html:393 -msgid "files removed" +#: kallithea/tests/data/templates/summary/statistics.html.py:155 +msgid "commit" +msgstr "" + +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 +msgid "file added" msgstr "" #: kallithea/templates/summary/statistics.html:395 -msgid "commit" +#: kallithea/tests/data/templates/summary/statistics.html.py:159 +msgid "file changed" msgstr "" #: kallithea/templates/summary/statistics.html:396 -msgid "file added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:397 -msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "" +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 +msgid "Show by ID" +msgstr "" + #: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/summary/summary.html.py:143 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "" +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 +msgid "Download" +msgstr "" + +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 +msgid "Downloads are disabled for this repository" +msgstr "" + #: kallithea/templates/summary/summary.html:108 -msgid "Download" +#: kallithea/tests/data/templates/summary/summary.html.py:190 +msgid "Download as zip" msgstr "" #: kallithea/templates/summary/summary.html:112 -msgid "There are no downloads yet" +#: kallithea/tests/data/templates/summary/summary.html.py:194 +msgid "Check this to download archive with subrepos" msgstr "" #: kallithea/templates/summary/summary.html:114 -msgid "Downloads are disabled for this repository" -msgstr "" - -#: kallithea/templates/summary/summary.html:120 -msgid "Download as zip" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 -msgid "Check this to download archive with subrepos" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 +#: kallithea/tests/data/templates/summary/summary.html.py:196 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 msgid "Latest Changes" msgstr "" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "" +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "" +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." +"\n" +" The following " +"variables are available:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "" +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +msgid "The comment was made with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" +msgstr "" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "Cerrado, reemplazado por %s." + +#~ msgid "Closing." +#~ msgstr "Cerrado." + +#~ msgid "An error occurred during creation of field" +#~ msgstr "" + +#~ msgid "Changeset not found" +#~ msgstr "" + +#~ msgid "Repository no access" +#~ msgstr "" + +#~ msgid "Repository read access" +#~ msgstr "" + +#~ msgid "Repository write access" +#~ msgstr "" + +#~ msgid "Repository admin access" +#~ msgstr "" + +#~ msgid "Repository Group no access" +#~ msgstr "" + +#~ msgid "Repository Group read access" +#~ msgstr "" + +#~ msgid "Repository Group write access" +#~ msgstr "" + +#~ msgid "Repository Group admin access" +#~ msgstr "" + +#~ msgid "Repository creation disabled" +#~ msgstr "" + +#~ msgid "Repository creation enabled" +#~ msgstr "" + +#~ msgid "Repository forking disabled" +#~ msgstr "" + +#~ msgid "Repository forking enabled" +#~ msgstr "" + +#~ msgid "Register disabled" +#~ msgstr "" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "" + +#~ msgid "Not Reviewed" +#~ msgstr "" + +#~ msgid "Rejected" +#~ msgstr "" + +#~ msgid "Under Review" +#~ msgstr "" + +#~ msgid "Repository group no access" +#~ msgstr "" + +#~ msgid "Repository group read access" +#~ msgstr "" + +#~ msgid "Repository group write access" +#~ msgstr "" + +#~ msgid "Repository group admin access" +#~ msgstr "" + +#~ msgid "User group no access" +#~ msgstr "" + +#~ msgid "User group read access" +#~ msgstr "" + +#~ msgid "User group write access" +#~ msgstr "" + +#~ msgid "User group admin access" +#~ msgstr "" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "" + +#~ msgid "User Group creation disabled" +#~ msgstr "" + +#~ msgid "User Group creation enabled" +#~ msgstr "" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "" + +#~ msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "repositories" +#~ msgstr "" + +#~ msgid "No repositories found." +#~ msgstr "" + +#~ msgid "There are no branches yet" +#~ msgstr "" + +#~ msgid "There are no tags yet" +#~ msgstr "" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "" + +#~ msgid "Analytics HTML block" +#~ msgstr "" + +#~ msgid "" +#~ "HTML with JavaScript for web analytics" +#~ " systems like Google Analytics or " +#~ "Piwik. This will be added at the" +#~ " bottom of every page." +#~ msgstr "" + +#~ msgid "" +#~ "Schema of clone URL construction eg. " +#~ "'{scheme}://{user}@{netloc}/{repo}'.\n" +#~ " The " +#~ "following variables are available:\n" +#~ " {scheme}" +#~ " 'http' or 'https' sent from running" +#~ " Kallithea server,\n" +#~ " {user}" +#~ " current user username,\n" +#~ " {netloc}" +#~ " network location/server host of running" +#~ " Kallithea server,\n" +#~ " {repo}" +#~ " full repository name,\n" +#~ " {repoid}" +#~ " ID of repository, can be used " +#~ "to contruct clone-by-id" +#~ msgstr "" + +#~ msgid "enabled" +#~ msgstr "" + +#~ msgid "disabled" +#~ msgstr "" + +#~ msgid "%s Bookmarks" +#~ msgstr "" + +#~ msgid "Compare Bookmarks" +#~ msgstr "" + +#~ msgid "%s Branches" +#~ msgstr "" + +#~ msgid "Compare Branches" +#~ msgstr "" + +#~ msgid "" +#~ "Changeset status: %s\n" +#~ "Click to open associated pull request %s" +#~ msgstr "" + +#~ msgid "Editing file" +#~ msgstr "" + +#~ msgid "Update" +#~ msgstr "" + +#~ msgid "" +#~ "Pull requests do not change once " +#~ "created. Select a revision and save " +#~ "to replace this pull request with " +#~ "a new one." +#~ msgstr "" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "" + +#~ msgid "%s Tags" +#~ msgstr "" + +#~ msgid "Compare Tags" +#~ msgstr "" + diff -r a48802bf7134 -r 880e2f07651b kallithea/i18n/fr/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Thu Jul 27 03:02:37 2017 +0200 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Thu Jul 27 14:26:14 2017 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2016-03-14 16:51+0100\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: 2016-03-21 13:00+0000\n" "Last-Translator: Étienne Gilli \n" "Language-Team: French " @@ -19,81 +19,102 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Weblate 2.6-dev\n" -#: kallithea/controllers/changelog.py:85 -#: kallithea/controllers/pullrequests.py:240 kallithea/lib/base.py:515 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "Il n’y a aucun changement pour le moment" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "Aucun" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:198 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "(fermé)" -#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "Afficher les espaces et tabulations" -#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 msgid "Ignore whitespace" msgstr "Ignorer les espaces et tabulations" -#: kallithea/controllers/changeset.py:168 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Augmenter le contexte du diff à %(num)s lignes" -#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:744 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "Une telle révision n'existe pas pour ce dépôt" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "Sélectionner le changeset" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "Aller au sommet (tip) du dépôt" + +#: kallithea/controllers/compare.py:73 +#, fuzzy +#| msgid "Cannot compare repositories without using common ancestor" +msgid "Cannot compare repositories of different types" +msgstr "Impossible de comparer des dépôts sans utiliser un ancêtre commun" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "Impossible de comparer des dépôts sans utiliser un ancêtre commun" +#: kallithea/controllers/error.py:70 +msgid "No response" +msgstr "Pas de réponse" + #: kallithea/controllers/error.py:71 -msgid "No response" -msgstr "Pas de réponse" - -#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Erreur inconnue" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" "Le serveur n’a pas pu interpréter la requête à cause d’une erreur de " "syntaxe." -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Accès interdit à cette ressource" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "Vous n’avez pas la permission de voir cette page" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "Ressource introuvable" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -101,379 +122,399 @@ "La requête n’a pu être traitée en raison d’une erreur survenue sur le " "serveur." -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "Changements sur le dépôt %s" - -#: kallithea/controllers/feed.py:56 +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 +#: kallithea/templates/changeset/changeset.html:195 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 +msgid "Changeset was too big and was cut off..." +msgstr "Cet ensemble de changements était trop important et a été découpé…" + +#: kallithea/controllers/feed.py:84 +#, python-format +msgid "%s committed on %s" +msgstr "%s a commité, le %s" + +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 #, python-format msgid "%s %s feed" msgstr "Flux %s de %s" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 -msgid "Changeset was too big and was cut off..." -msgstr "Cet ensemble de changements était trop important et a été découpé…" - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "%s a commité, le %s" - -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 +#, python-format +msgid "Changes on %s repository" +msgstr "Changements sur le dépôt %s" + +#: kallithea/controllers/files.py:93 msgid "Click here to add new file" msgstr "Ajouter un nouveau fichier" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "Il n'y a actuellement pas de fichiers. %s" -#: kallithea/controllers/files.py:195 +#: kallithea/controllers/files.py:191 #, python-format msgid "%s at %s" msgstr "%s à %s" -#: kallithea/controllers/files.py:307 kallithea/controllers/files.py:367 -#: kallithea/controllers/files.py:434 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Ce dépôt a été verrouillé par %s sur %s" -#: kallithea/controllers/files.py:319 +#: kallithea/controllers/files.py:309 msgid "You can only delete files with revision being a valid branch" msgstr "" -"Vous ne pouvez supprimer que les fichiers dont la révision est une branche " -"valide" - -#: kallithea/controllers/files.py:330 +"Vous ne pouvez supprimer que les fichiers dont la révision est une " +"branche valide" + +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Le fichier %s a été supprimé via Kallithea" -#: kallithea/controllers/files.py:352 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "Suppression du fichier %s effectuée avec succès" -#: kallithea/controllers/files.py:356 kallithea/controllers/files.py:422 -#: kallithea/controllers/files.py:503 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "Une erreur est survenue durant le commit" -#: kallithea/controllers/files.py:379 +#: kallithea/controllers/files.py:369 msgid "You can only edit files with revision being a valid branch" msgstr "" -"Vous ne pouvez modifier que les fichiers dont la révision est une branche " -"valide" - -#: kallithea/controllers/files.py:393 +"Vous ne pouvez modifier que les fichiers dont la révision est une branche" +" valide" + +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "%s édité via Kallithea" -#: kallithea/controllers/files.py:409 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "Aucun changement" -#: kallithea/controllers/files.py:418 kallithea/controllers/files.py:492 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "Commit réalisé avec succès sur %s" -#: kallithea/controllers/files.py:445 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "%s ajouté par Kallithea" -#: kallithea/controllers/files.py:466 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "Aucun contenu" -#: kallithea/controllers/files.py:470 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "Aucun nom de fichier" -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Le chemin doit être un chemin relatif et ne doit pas contenir .. dans le " "chemin" -#: kallithea/controllers/files.py:528 +#: kallithea/controllers/files.py:517 msgid "Downloads disabled" msgstr "Les téléchargements sont désactivés" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:528 #, python-format msgid "Unknown revision %s" msgstr "Révision %s inconnue" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "Dépôt vide" -#: kallithea/controllers/files.py:543 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "Type d’archive inconnu" -#: kallithea/controllers/files.py:773 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "Changesets" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "Branches" -#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "Tags" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "Une erreur est survenue durant le fork du dépôt %s" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "Groupes" -#: kallithea/controllers/home.py:94 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:479 -#: kallithea/templates/base/base.html:653 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "Dépôts" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "Branche" -#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "Branches fermées" -#: kallithea/controllers/home.py:151 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "Étiquette" -#: kallithea/controllers/home.py:157 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "Signet" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "Journal public" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:306 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "Historique" -#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 msgid "Bad captcha" msgstr "Mauvais captcha" -#: kallithea/controllers/login.py:150 +#: kallithea/controllers/login.py:148 +#, python-format msgid "You have successfully registered with %s" msgstr "Vous vous êtes inscrits avec succès à %s" -#: kallithea/controllers/login.py:195 +#: kallithea/controllers/login.py:193 msgid "A password reset confirmation code has been sent" msgstr "Un lien de confirmation de réinitialisation de mot de passe a été envoyé" -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:242 msgid "Invalid password reset token" msgstr "Clé de réinitialisation de mot de passe invalide" -#: kallithea/controllers/login.py:249 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "Mot de passe mis à jour avec succès" -#: kallithea/controllers/pullrequests.py:123 -#, python-format -msgid "%s (closed)" -msgstr "%s (fermé)" - -#: kallithea/controllers/pullrequests.py:151 -#: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 -msgid "Changeset" -msgstr "Changements" - -#: kallithea/controllers/pullrequests.py:172 -msgid "Special" -msgstr "Spécial" - -#: kallithea/controllers/pullrequests.py:173 -msgid "Peer branches" -msgstr "Branches appairées" - -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 -msgid "Bookmarks" -msgstr "Signets" - -#: kallithea/controllers/pullrequests.py:312 -#, python-format -msgid "Error creating pull request: %s" -msgstr "Erreur de création de la demande de pull : %s" - -#: kallithea/controllers/pullrequests.py:358 -#: kallithea/controllers/pullrequests.py:505 -msgid "No description" -msgstr "Aucune description" - -#: kallithea/controllers/pullrequests.py:365 -msgid "Successfully opened new pull request" -msgstr "La requête de pull a été ouverte avec succès" - -#: kallithea/controllers/pullrequests.py:368 -#: kallithea/controllers/pullrequests.py:455 -#: kallithea/controllers/pullrequests.py:512 +#: kallithea/controllers/pullrequests.py:73 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "Reviewer spécifié \"%s\" non valide" -#: kallithea/controllers/pullrequests.py:371 -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:135 +#, python-format +msgid "%s (closed)" +msgstr "%s (fermé)" + +#: kallithea/controllers/pullrequests.py:162 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 +msgid "Changeset" +msgstr "Changements" + +#: kallithea/controllers/pullrequests.py:183 +msgid "Special" +msgstr "Spécial" + +#: kallithea/controllers/pullrequests.py:184 +msgid "Peer branches" +msgstr "Branches appairées" + +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 +msgid "Bookmarks" +msgstr "Signets" + +#: kallithea/controllers/pullrequests.py:326 +#, python-format +msgid "Error creating pull request: %s" +msgstr "Erreur de création de la demande de pull : %s" + +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 msgid "Error occurred while creating pull request" msgstr "Une erreur est survenue durant la création de la pull request" -#: kallithea/controllers/pullrequests.py:403 -msgid "Missing changesets since the previous pull request:" -msgstr "Changeset manquant depuis la précédente pull request :" +#: kallithea/controllers/pullrequests.py:358 +msgid "Successfully opened new pull request" +msgstr "La requête de pull a été ouverte avec succès" + +#: kallithea/controllers/pullrequests.py:381 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" +msgstr "Mise à jour de la pull request créée" #: kallithea/controllers/pullrequests.py:410 #, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "Nouveau changeset sur %s %s depuis la précédente pull request :" - -#: kallithea/controllers/pullrequests.py:417 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" -"L'ancêtre n'a pas changé - montrer les différences avec la version " -"précédente :" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" -"Cette demande de pull est basée sur une autre révision %s et il n'y a pas" -" de diff simple." - -#: kallithea/controllers/pullrequests.py:426 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "Aucun changement constaté sur %s %s depuis la version précédente." - -#: kallithea/controllers/pullrequests.py:464 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "Fermé, remplacé par %s." - -#: kallithea/controllers/pullrequests.py:472 -msgid "Pull request update created" -msgstr "Mise à jour de la pull request créée" - -#: kallithea/controllers/pullrequests.py:516 +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:414 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "Aucune description" + +#: kallithea/controllers/pullrequests.py:439 msgid "Pull request updated" msgstr "Pull request mise à jour" -#: kallithea/controllers/pullrequests.py:531 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "La requête de pull a été supprimée avec succès" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:491 +#, fuzzy, python-format +#| msgid "Changeset for %s %s not found in %s" +msgid "Revision %s not found in %s" +msgstr "Ensemble de changements non trouvé" + +#: kallithea/controllers/pullrequests.py:518 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "Pas de changeset trouvé pour ce pull request." + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "Cette pull request a déjà été fusionnée à %s." -#: kallithea/controllers/pullrequests.py:599 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "Cette pull request a été fermée et ne peut pas être mise à jour." -#: kallithea/controllers/pullrequests.py:617 -#, python-format -msgid "The following changes are available on %s:" +#: kallithea/controllers/pullrequests.py:552 +#, fuzzy, python-format +#| msgid "The following changes are available on %s:" +msgid "The following additional changes are available on %s:" msgstr "Les modifications suivantes sont disponibles sur %s :" -#: kallithea/controllers/pullrequests.py:621 -msgid "No changesets found for updating this pull request." +#: kallithea/controllers/pullrequests.py:556 +#, fuzzy +#| msgid "No changesets found for updating this pull request." +msgid "No additional changesets found for iterating on this pull request." msgstr "Pas de changeset trouvé pour ce pull request." -#: kallithea/controllers/pullrequests.py:629 +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Note: La branche %s a une autre tête: %s." -#: kallithea/controllers/pullrequests.py:635 -msgid "Git pull requests don't support updates yet." +#: kallithea/controllers/pullrequests.py:571 +#, fuzzy +#| msgid "Git pull requests don't support updates yet." +msgid "Git pull requests don't support iterating yet." msgstr "Le smises à jour des Git pull requests ne sont pas encore supportées." -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:573 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "Pas de changeset trouvé pour ce pull request." + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 msgid "No permission to change pull request status" msgstr "Permission manquante pour changer le statut du pull request" -#: kallithea/controllers/pullrequests.py:738 +#: kallithea/controllers/pullrequests.py:676 #, python-format msgid "Successfully deleted pull request %s" msgstr "La requête de pull %s a été supprimée avec succès" -#: kallithea/controllers/pullrequests.py:748 -msgid "Closing." -msgstr "Fermeture." - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "Requête invalide. Essayer de la mettre entre guillemets." -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" "L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de " "code Whoosh" -#: kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Une erreur est survenue pendant la recherche." -#: kallithea/controllers/summary.py:181 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 msgid "No data ready yet" msgstr "Aucune donnée actuellement disponible" -#: kallithea/controllers/summary.py:184 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "La mise à jour des statistiques est désactivée pour ce dépôt" @@ -487,153 +528,157 @@ "une erreur est survenue pendant la mise à jour des réglages " "d'authentification" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "Mise à jour des réglages par défaut effectuée avec succès" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "Une erreur est survenue durant la mise à jour des réglages par défaut" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 msgid "Forever" msgstr "Pour toujours" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "5 minutes" msgstr "5 minute" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 hour" msgstr "1 heure" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 msgid "1 day" msgstr "1 jour" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "1 mois" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:290 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "Toujours" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "Une erreur est survenue lors de la création du gist" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "Gist %s supprimé" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:200 msgid "Unmodified" msgstr "Non modifié" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "Le contenu du gist a été mis à jour avec succès" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "Les données du gist on été mises à jour avec succès" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "Une erreur est survenue durant la mise à jour du gist %s" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" " fonctionnement de l’application" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "Votre compte a été mis à jour avec succès" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:201 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "Une erreur est survenue durant la mise à jour de l'utilisateur %s" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" "Une erreur est survenue durant la mise à jour du mot de passe de " "l'utilisateur" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "L’e-mail « %s » a été ajouté à l’utilisateur" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "L’e-mail a été enlevé de l’utilisateur" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "Clé d'API créée avec succès" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "Clé d'API remise à zéro avec succès" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:324 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "Clé d'API supprimée avec succès" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "Lire" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" -msgstr "Écrire" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" +msgstr "Lire" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "Écrire" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -641,279 +686,296 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:336 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:344 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "Administration" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "Interdite" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "Autorisé avec activation de compte manuelle" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "Autorisé avec activation de compte automatique" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1705 -msgid "Manual activation of external account" -msgstr "Activation manuelle du compte externe" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1706 -msgid "Automatic activation of external account" -msgstr "Activation automatique du compte externe" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "Interdite" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "Autorisé avec activation de compte manuelle" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "Autorisé avec activation de compte automatique" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "Activation manuelle du compte externe" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "Activation automatique du compte externe" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "Autorisée" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "Permissions globales mises à jour avec succès" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Une erreur est survenue durant la mise à jour des permissions" -#: kallithea/controllers/admin/repo_groups.py:187 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Une erreur est survenue durant la création du groupe de dépôts %s" -#: kallithea/controllers/admin/repo_groups.py:192 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "Groupe de dépôts %s créé" -#: kallithea/controllers/admin/repo_groups.py:249 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "Groupe de dépôts %s mis à jour" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:248 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Une erreur est survenue durant la mise à jour du groupe de dépôts %s" -#: kallithea/controllers/admin/repo_groups.py:283 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Ce groupe contient %s dépôts et ne peut être supprimé" -#: kallithea/controllers/admin/repo_groups.py:290 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Ce groupe contient %s sous-groupes et ne peut pas être supprimé" -#: kallithea/controllers/admin/repo_groups.py:296 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "Groupe de dépôts %s supprimé" -#: kallithea/controllers/admin/repo_groups.py:301 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Une erreur est survenue durant la suppression du groupe de dépôts %s" -#: kallithea/controllers/admin/repo_groups.py:404 -#: kallithea/controllers/admin/repo_groups.py:439 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "Impossible de révoquer votre permission d'administrateur" -#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "Permissions du groupe de dépôts mises à jour" -#: kallithea/controllers/admin/repo_groups.py:456 -#: kallithea/controllers/admin/repos.py:397 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "Une erreur est survenue durant la révocation de la permission" -#: kallithea/controllers/admin/repos.py:151 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "Erreur de création du dépôt %s" -#: kallithea/controllers/admin/repos.py:212 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "Dépôt %s créé depuis %s" -#: kallithea/controllers/admin/repos.py:221 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "dépôt %s forké en tant que %s" -#: kallithea/controllers/admin/repos.py:224 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "Dépôt %s créé" -#: kallithea/controllers/admin/repos.py:261 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "Dépôt %s mis à jour avec succès" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "Une erreur est survenue durant la mise à jour du dépôt %s" -#: kallithea/controllers/admin/repos.py:309 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "%s forks détachés" -#: kallithea/controllers/admin/repos.py:312 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "%s forks supprimés" -#: kallithea/controllers/admin/repos.py:317 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "Dépôt %s supprimé" -#: kallithea/controllers/admin/repos.py:320 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Impossible de supprimer le dépôt %s : des forks y sont attachés" -#: kallithea/controllers/admin/repos.py:325 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "Erreur pendant la suppression de %s" -#: kallithea/controllers/admin/repos.py:373 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "Permissions du dépôt mises à jour" -#: kallithea/controllers/admin/repos.py:429 -msgid "An error occurred during creation of field" +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, fuzzy, python-format +#| msgid "An error occurred during creation of field" +msgid "An error occurred during creation of field: %r" msgstr "Une erreur est survenue durant la création du champ" -#: kallithea/controllers/admin/repos.py:443 +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "Une erreur est survenue durant la suppression du champ" -#: kallithea/controllers/admin/repos.py:459 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "-- Pas un fork --" -#: kallithea/controllers/admin/repos.py:490 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "La visibilité du dépôt dans le journal public a été mise à jour" -#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "" "Une erreur est survenue durant la configuration du journal public pour ce" " dépôt" -#: kallithea/controllers/admin/repos.py:511 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "[Aucun dépôt]" -#: kallithea/controllers/admin/repos.py:513 +#: kallithea/controllers/admin/repos.py:473 #, python-format 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:520 +#: kallithea/controllers/admin/repos.py:480 msgid "An error occurred during this operation" msgstr "Une erreur est survenue durant cette opération" -#: kallithea/controllers/admin/repos.py:536 -#: kallithea/controllers/admin/repos.py:563 +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 msgid "Repository has been locked" msgstr "Ce dépôt a été verrouillé" -#: kallithea/controllers/admin/repos.py:539 -#: kallithea/controllers/admin/repos.py:560 +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 msgid "Repository has been unlocked" msgstr "Ce dépôt a été déverrouillé" -#: kallithea/controllers/admin/repos.py:542 -#: kallithea/controllers/admin/repos.py:567 +#: kallithea/controllers/admin/repos.py:502 +#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during unlocking" msgstr "Une erreur est survenue durant le déverrouillage" -#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:533 msgid "Cache invalidation successful" msgstr "Invalidation du cache réalisée avec succès" -#: kallithea/controllers/admin/repos.py:585 +#: kallithea/controllers/admin/repos.py:537 msgid "An error occurred during cache invalidation" msgstr "Une erreur est survenue durant l’invalidation du cache" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "Les changements distants ont été récupérés" -#: kallithea/controllers/admin/repos.py:603 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "Une erreur est survenue durant le pull depuis la source distante" -#: kallithea/controllers/admin/repos.py:636 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "Une erreur est survenue durant la suppression des statistiques du dépôt" -#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "Réglages des gestionnaires de versions mis à jour" -#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -921,340 +983,354 @@ "Impossible d'activer la prise en charge de hgsubversion. La bibliothèque " "« hgsubversion » est manquante" -#: kallithea/controllers/admin/settings.py:151 -#: kallithea/controllers/admin/settings.py:248 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "" "Une erreur est survenue durant la mise à jour des réglages de " "l'application" -#: kallithea/controllers/admin/settings.py:187 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Dépôts ré-analysés avec succès. Ajouté : %s. Supprimé : %s." -#: kallithea/controllers/admin/settings.py:244 +#: kallithea/controllers/admin/settings.py:189 +#, fuzzy, python-format +msgid "Invalidated %s repositories" +msgstr "Invalider le cache pour tous les dépôts" + +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "Réglages mis à jour" -#: kallithea/controllers/admin/settings.py:301 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Réglages d’affichage mis à jour" -#: kallithea/controllers/admin/settings.py:306 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" "Une erreur est survenue durant la mise à jour des réglages de " "visualisation" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Veuillez entrer votre adresse e-mail" -#: kallithea/controllers/admin/settings.py:347 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "Tâche d'envoi d'e-mail créée" -#: kallithea/controllers/admin/settings.py:378 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "Le nouveau hook a été ajouté" -#: kallithea/controllers/admin/settings.py:392 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "Hooks mis à jour" -#: kallithea/controllers/admin/settings.py:396 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "Une erreur est survenue durant la création du hook" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "La tâche de réindexation Whoosh a été planifiée" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "Groupe d'utilisateurs %s créé" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Une erreur est survenue durant la création du groupe d'utilisateurs %s" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "Groupe d'utilisateurs %s mis à jour" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:208 #, python-format msgid "Error occurred during update of user group %s" msgstr "Une erreur est survenue durant la mise à jour du groupe d'utilisateurs %s" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:219 msgid "Successfully deleted user group" msgstr "Groupe d'utilisateurs supprimé avec succès" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:224 msgid "An error occurred during deletion of user group" msgstr "Une erreur est survenue durant la suppression du groupe d'utilisateurs" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "Le groupe cible ne peut pas être le même" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "Permissions du groupe d'utilisateurs mises à jour" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "Permissions mises à jour" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "Une erreur est survenue durant l’enregistrement des permissions" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "Utilisateur %s créé" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "Une erreur est survenue durant la création de l'utilisateur %s" -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "L’utilisateur a été mis à jour avec succès" -#: kallithea/controllers/admin/users.py:217 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "Utilisateur supprimé avec succès" -#: kallithea/controllers/admin/users.py:222 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "Une erreur est survenue durant la suppression de l’utilisateur" -#: kallithea/controllers/admin/users.py:235 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "L'utilisateur par défaut ne peut pas être modifié" -#: kallithea/controllers/admin/users.py:462 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "L'adresse IP %s a été ajoutée à la liste blanche" -#: kallithea/controllers/admin/users.py:468 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "Une erreur est survenue durant la sauvegarde d'IP" -#: kallithea/controllers/admin/users.py:482 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "L'adresse IP a été supprimée de la liste blanche" -#: kallithea/lib/auth.py:737 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "IP %s non autorisée" -#: kallithea/lib/auth.py:750 -msgid "Invalid API key" -msgstr "Clé d'API invalide" - -#: kallithea/lib/auth.py:768 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" -"Une fuite de jeton CSRF a été détectée - tous les jetons de formulaire ont " -"été marqués « expirés »" - -#: kallithea/lib/auth.py:813 +#: kallithea/lib/auth.py:829 msgid "You need to be a registered user to perform this action" msgstr "Vous devez être un utilisateur enregistré pour effectuer cette action" -#: kallithea/lib/auth.py:843 +#: kallithea/lib/auth.py:857 msgid "You need to be signed in to view this page" msgstr "Vous devez être connecté pour visualiser cette page" -#: kallithea/lib/base.py:493 +#: kallithea/lib/base.py:449 +msgid "Invalid API key" +msgstr "Clé d'API invalide" + +#: kallithea/lib/base.py:508 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" +"Une fuite de jeton CSRF a été détectée - tous les jetons de formulaire " +"ont été marqués « expirés »" + +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "Dépôt non trouvé sur le système de fichiers" -#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:623 -msgid "Changeset not found" +#: kallithea/lib/base.py:617 +#, fuzzy, python-format +msgid "Changeset for %s %s not found in %s" msgstr "Ensemble de changements non trouvé" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "Fichier binaire" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Cet ensemble de changements était trop gros pour être affiché et a été " "découpé, utilisez le menu « diff » pour afficher les différences" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "Aucun changement détecté" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "Branche supprimée : %s" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "Étiquette créée : %s" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:613 +#, fuzzy, python-format +msgid "Changeset %s not found" +msgstr "Ensemble de changements non trouvé" + +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Afficher les changements combinés %s->%s" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 msgid "Compare view" msgstr "Vue de comparaison" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "et" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "%s de plus" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "révisions" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, python-format msgid "Fork name %s" msgstr "Nom du fork %s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, python-format msgid "Pull request %s" msgstr "Requête de pull %s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "[téléchargée] archive depuis le dépôt" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "[a supprimé] le dépôt" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "[a créé] l’utilisateur" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "[a mis à jour] l’utilisateur" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "[créé] groupe d'utilisateurs" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "[mis à jour] groupe d'utilisateurs" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "[a commenté] une révision du dépôt" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "[a commenté] la requête de pull pour" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "[a fermé] la requête de pull de" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "[a pushé] dans" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "[a commité via Kallithea] dans le dépôt" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "[a pullé depuis un site distant] dans le dépôt" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr " et %s de plus" -#: kallithea/lib/helpers.py:1128 -#: kallithea/templates/compare/compare_diff.html:71 -#: kallithea/templates/pullrequests/pullrequest_show.html:337 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "Aucun fichier" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "nouveau fichier" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "suppr." -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "renommer" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1469 +#: kallithea/lib/helpers.py:1230 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1265,760 +1341,423 @@ "probablement été créé ou renommé manuellement. Veuillez relancer " "l’application pour rescanner les dépôts" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d an" msgstr[1] "%d ans" -#: kallithea/lib/utils2.py:435 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mois" msgstr[1] "%d mois" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: kallithea/lib/utils2.py:437 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: kallithea/lib/utils2.py:439 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d secondes" -#: kallithea/lib/utils2.py:455 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "dans %s" -#: kallithea/lib/utils2.py:457 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "Il y a %s" -#: kallithea/lib/utils2.py:459 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "dans %s et %s" -#: kallithea/lib/utils2.py:462 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "Il y a %s et %s" -#: kallithea/lib/utils2.py:465 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "à l’instant" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "Aucun accès au dépôt" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "Accès en lecture au dépôt" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "Accès en écriture au dépôt" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "Accès administrateur au dépôt" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "Aucun accès au groupe de dépôts" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "Accès en lecture au groupe de dépôts" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "Accès en écriture au groupe de dépôts" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "Accès administrateur au groupe de dépôts" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1669 +#: kallithea/model/comment.py:68 +#, python-format +msgid "on line %s" +msgstr "à la ligne %s" + +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +msgid "[Mention]" +msgstr "[Mention]" + +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "niveau supérieur" + +#: kallithea/model/db.py:1715 msgid "Kallithea Administrator" msgstr "Administrateur Kallithea" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "Création de dépôt désactivée" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "Création de dépôt activée" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "Fork de dépôt désactivé" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "Fork de dépôt activé" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "Enregistrement désactivé" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "Enregistrer un nouvel utilisateur Kallithea manuellement activé" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "Enregistrer un nouvel utilisateur Kallithea auto-activé" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "Pas encore relue" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2237 -msgid "Approved" -msgstr "Approuvée" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2238 -msgid "Rejected" -msgstr "Rejetée" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "En cours de relecture" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1518 -msgid "top level" -msgstr "niveau supérieur" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "Groupe de dépôts, pas d'accès" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "Groupe de dépôts, accès en lecture" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "Groupe de dépôts, accès en écriture" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "Groupe de dépôts, accès d'administration" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "Groupe d'utilisateurs, pas d'accès" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "Groupe d'utilisateurs, accès en lecture" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "Groupe d'utilisateurs, accès en écriture" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "Groupe d'utilisateurs, accès d'administration" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "Création de groupes de dépôts désactivée" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "Création de groupes de dépôts activée" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "Création de groupes d'utilisateurs désactivée" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "Création de groupes d'utilisateurs activée" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1701 -msgid "Registration disabled" -msgstr "Enregistrement désactivé" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "Enregistrement des utilisateurs avec activation de compte manuelle" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "Enregistrement des utilisateurs avec activation de compte automatique" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1695 +#: kallithea/model/db.py:1717 +msgid "Default user has no access to new repositories" +msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux dépôts" + +#: kallithea/model/db.py:1718 +msgid "Default user has read access to new repositories" +msgstr "L'utilisateur par défaut a un accès en lecture aux nouveaux dépôts" + +#: kallithea/model/db.py:1719 +msgid "Default user has write access to new repositories" +msgstr "L'utilisateur par défaut a un accès en écriture aux nouveaux dépôts" + +#: kallithea/model/db.py:1720 +msgid "Default user has admin access to new repositories" +msgstr "L'utilisateur par défaut a un accès administrateur aux nouveaux dépôts" + +#: kallithea/model/db.py:1722 +msgid "Default user has no access to new repository groups" +msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux groupes de dépôts" + +#: kallithea/model/db.py:1723 +msgid "Default user has read access to new repository groups" +msgstr "" +"L'utilisateur par défaut a accès en lecture seule aux nouveaux groupes de" +" dépôts" + +#: kallithea/model/db.py:1724 +msgid "Default user has write access to new repository groups" +msgstr "" +"L'utilisateur par défaut a accès en écriture aux nouveaux groupes de " +"dépôts" + +#: kallithea/model/db.py:1725 +msgid "Default user has admin access to new repository groups" +msgstr "" +"L'utilisateur par défaut a accès administrateur aux nouveaux groupes de " +"dépôts" + +#: kallithea/model/db.py:1727 +msgid "Default user has no access to new user groups" +msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux groupes d'utilisateurs" + +#: kallithea/model/db.py:1728 +msgid "Default user has read access to new user groups" +msgstr "" +"L'utilisateur par défaut a accès en lecture seule aux nouveaux groupes " +"d'utilisateurs" + +#: kallithea/model/db.py:1729 +msgid "Default user has write access to new user groups" +msgstr "" +"L'utilisateur par défaut a accès en écriture aux nouveaux groupes " +"d'utilisateurs" + +#: kallithea/model/db.py:1730 +msgid "Default user has admin access to new user groups" +msgstr "" +"L'utilisateur par défaut a un accès administrateur aux nouveaux groupes " +"d'utilisateurs" + +#: kallithea/model/db.py:1732 +msgid "Only admins can create repository groups" +msgstr "Seul un administrateur peut créer un groupe de dépôts" + +#: kallithea/model/db.py:1733 +msgid "Non-admins can create repository groups" +msgstr "Les utilisateurs non-administrateurs peuvent créer des groupes de dépôts" + +#: kallithea/model/db.py:1735 +msgid "Only admins can create user groups" +msgstr "Seul un administrateur peut créer des groupes d'utilisateurs" + +#: kallithea/model/db.py:1736 +msgid "Non-admins can create user groups" +msgstr "" +"Les utilisateurs non-administrateurs peuvent créer des groupes " +"d'utilisateurs" + +#: kallithea/model/db.py:1738 +msgid "Only admins can create top level repositories" +msgstr "Seul un administrateur peut créer des dépôts de niveau supérieur" + +#: kallithea/model/db.py:1739 +msgid "Non-admins can create top level repositories" +msgstr "" +"Les utilisateurs non-administrateurs peuvent créer des dépôts de niveau " +"supérieur" + +#: kallithea/model/db.py:1741 msgid "Repository creation enabled with write permission to a repository group" msgstr "" "Création de dépôts activée avec l'accès en écriture vers un groupe de " "dépôts" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1696 +#: kallithea/model/db.py:1742 msgid "Repository creation disabled with write permission to a repository group" msgstr "" "Création de dépôts désactivée avec l'accès en écriture vers un groupe de " "dépôts" -#: kallithea/model/comment.py:72 -#, python-format -msgid "on line %s" -msgstr "à la ligne %s" - -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 -msgid "[Mention]" -msgstr "[Mention]" - -#: kallithea/model/db.py:1671 -msgid "Default user has no access to new repositories" -msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux dépôts" - -#: kallithea/model/db.py:1672 -msgid "Default user has read access to new repositories" -msgstr "L'utilisateur par défaut a un accès en lecture aux nouveaux dépôts" - -#: kallithea/model/db.py:1673 -msgid "Default user has write access to new repositories" -msgstr "L'utilisateur par défaut a un accès en écriture aux nouveaux dépôts" - -#: kallithea/model/db.py:1674 -msgid "Default user has admin access to new repositories" -msgstr "L'utilisateur par défaut a un accès administrateur aux nouveaux dépôts" - -#: kallithea/model/db.py:1676 -msgid "Default user has no access to new repository groups" -msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux groupes de dépôts" - -#: kallithea/model/db.py:1677 -msgid "Default user has read access to new repository groups" -msgstr "" -"L'utilisateur par défaut a accès en lecture seule aux nouveaux groupes de" -" dépôts" - -#: kallithea/model/db.py:1678 -msgid "Default user has write access to new repository groups" -msgstr "" -"L'utilisateur par défaut a accès en écriture aux nouveaux groupes de " -"dépôts" - -#: kallithea/model/db.py:1679 -msgid "Default user has admin access to new repository groups" -msgstr "" -"L'utilisateur par défaut a accès administrateur aux nouveaux groupes de " -"dépôts" - -#: kallithea/model/db.py:1681 -msgid "Default user has no access to new user groups" -msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux groupes d'utilisateurs" - -#: kallithea/model/db.py:1682 -msgid "Default user has read access to new user groups" -msgstr "" -"L'utilisateur par défaut a accès en lecture seule aux nouveaux groupes " -"d'utilisateurs" - -#: kallithea/model/db.py:1683 -msgid "Default user has write access to new user groups" -msgstr "" -"L'utilisateur par défaut a accès en écriture aux nouveaux groupes " -"d'utilisateurs" - -#: kallithea/model/db.py:1684 -msgid "Default user has admin access to new user groups" -msgstr "" -"L'utilisateur par défaut a un accès administrateur aux nouveaux groupes " -"d'utilisateurs" - -#: kallithea/model/db.py:1686 -msgid "Only admins can create repository groups" -msgstr "Seul un administrateur peut créer un groupe de dépôts" - -#: kallithea/model/db.py:1687 -msgid "Non-admins can create repository groups" -msgstr "Les utilisateurs non-administrateurs peuvent créer des groupes de dépôts" - -#: kallithea/model/db.py:1689 -msgid "Only admins can create user groups" -msgstr "Seul un administrateur peut créer des groupes d'utilisateurs" - -#: kallithea/model/db.py:1690 -msgid "Non-admins can create user groups" -msgstr "" -"Les utilisateurs non-administrateurs peuvent créer des groupes " -"d'utilisateurs" - -#: kallithea/model/db.py:1692 -msgid "Only admins can create top level repositories" -msgstr "Seul un administrateur peut créer des dépôts de niveau supérieur" - -#: kallithea/model/db.py:1693 -msgid "Non-admins can create top level repositories" -msgstr "" -"Les utilisateurs non-administrateurs peuvent créer des dépôts de niveau " -"supérieur" - -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1744 msgid "Only admins can fork repositories" msgstr "Seul un administrateur peut faire un fork de dépôt" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1745 msgid "Non-admins can fork repositories" msgstr "Les utilisateurs non-administrateurs peuvent faire un fork de dépôt" -#: kallithea/model/db.py:1702 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "Enregistrement désactivé" + +#: kallithea/model/db.py:1748 msgid "User registration with manual account activation" msgstr "Enregistrement des utilisateurs avec activation de compte manuelle" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1749 msgid "User registration with automatic account activation" msgstr "Enregistrement des utilisateurs avec activation de compte automatique" -#: kallithea/model/db.py:2236 +#: kallithea/model/db.py:2276 msgid "Not reviewed" msgstr "Pas encore relue" -#: kallithea/model/db.py:2239 +#: kallithea/model/db.py:2277 msgid "Under review" msgstr "En cours de relecture" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2278 +#, fuzzy +#| msgid "Approved" +msgid "Not approved" +msgstr "Approuvée" + +#: kallithea/model/db.py:2279 +msgid "Approved" +msgstr "Approuvée" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "Veuillez entrer un identifiant" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Entrez une valeur d’au moins %(min)i caractères de long" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "Veuillez entrer un mot de passe" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "Entrez au moins %(min)i caractères" -#: kallithea/model/forms.py:165 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "Le nom ne doit pas contenir seulement des chiffres" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:240 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s a commenté sur le changeset %(age)s" -#: kallithea/model/notification.py:255 +#: kallithea/model/notification.py:241 #, python-format msgid "%(user)s sent message %(age)s" msgstr "%(user)s a envoyé un message %(age)s" -#: kallithea/model/notification.py:256 +#: kallithea/model/notification.py:242 #, python-format msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s vous a mentionné %(age)s" -#: kallithea/model/notification.py:257 +#: kallithea/model/notification.py:243 #, python-format msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s s'est enregistré sur Kallithea %(age)s" -#: kallithea/model/notification.py:258 +#: kallithea/model/notification.py:244 #, python-format msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s a ouvert une nouvelle demande de pull %(age)s" -#: kallithea/model/notification.py:259 +#: kallithea/model/notification.py:245 #, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s a commenté la demande de pull %(age)s" -#: kallithea/model/notification.py:266 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s a commenté sur le changeset à %(when)s" -#: kallithea/model/notification.py:267 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s a envoyé un message à %(when)s" -#: kallithea/model/notification.py:268 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s vous a mentionné à %(when)s" -#: kallithea/model/notification.py:269 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s s'est enregistré sur Kallithea à %(when)s" -#: kallithea/model/notification.py:270 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s a ouvert une nouvelle demande de pull à %(when)s" -#: kallithea/model/notification.py:271 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s a commenté la demande de pull à %(when)s" -#: kallithea/model/notification.py:302 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +#: kallithea/model/notification.py:288 +#, fuzzy, python-format +#| msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" msgstr "[Commentaire] Changeset %(short_id)s de %(repo_name)s dans %(branch)s" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:291 #, python-format msgid "New user %(new_username)s registered" msgstr "Nouvel utilisateur %(new_username)s enregistré" +#: kallithea/model/notification.py:293 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:307 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" -"[Ajouté] Demande de pull %(pr_nice_id)s à partir de %(ref)s pour " -"%(repo_name)s" - -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" -"[Commentaire] Demande de pull %(pr_nice_id)s à partir de %(ref)s pour " -"%(repo_name)s" - -#: kallithea/model/notification.py:321 msgid "Closing" msgstr "Fermeture" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" "%(user)s veut que vous regardiez la demande de pull %(pr_nice_id)s : " "%(pr_title)s" -#: kallithea/model/scm.py:708 +#: kallithea/model/pull_request.py:211 +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Cannot create empty pull request" +msgstr "Erreur de création de la demande de pull : %s" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +#, fuzzy +#| msgid "Confirm to delete this pull request" +msgid "You are not authorized to create the pull request" +msgstr "Veuillez confirmer la suppression de cette requête de pull" + +#: kallithea/model/pull_request.py:341 +#, fuzzy +#| msgid "Missing changesets since the previous pull request:" +msgid "Missing changesets since the previous iteration:" +msgstr "Changeset manquant depuis la précédente pull request :" + +#: kallithea/model/pull_request.py:348 +#, fuzzy, python-format +#| msgid "New changesets on %s %s since the previous pull request:" +msgid "New changesets on %s %s since the previous iteration:" +msgstr "Nouveau changeset sur %s %s depuis la précédente pull request :" + +#: kallithea/model/pull_request.py:355 +#, fuzzy +#| msgid "Ancestor didn't change - show diff since previous version:" +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" +"L'ancêtre n'a pas changé - montrer les différences avec la version " +"précédente :" + +#: kallithea/model/pull_request.py:362 +#, fuzzy, python-format +#| msgid "" "This pull request is based on another %s revision and there is no +#| simple " "diff." +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" +"Cette demande de pull est basée sur une autre révision %s et il n'y a pas" +" de diff simple." + +#: kallithea/model/pull_request.py:364 +#, fuzzy, python-format +#| msgid "No changes found on %s %s since previous version." +msgid "No changes found on %s %s since previous iteration." +msgstr "Aucun changement constaté sur %s %s depuis la version précédente." + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "Dernier sommet" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "Nouveau enregistrement d'utilisateur" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" "Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le " "bon fonctionnement de l’application" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -2027,7 +1766,7 @@ "L’utilisateur \"%s\" possède %s dépôts et ne peut être supprimé. Changez " "les propriétaires ou supprimez ces dépôts : %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" @@ -2036,7 +1775,7 @@ "L’utilisateur \"%s\" possède %s groupes de dépôt et ne peut être " "supprimé. Changez les propriétaires ou supprimez ces dépôts : %s" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -2046,15 +1785,15 @@ "être supprimé. Changez les propriétaires de ces groupes d'utilisateurs ou" " supprimez-les : %s" -#: kallithea/model/user.py:368 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "Lien de remise à zéro du mot de passe" -#: kallithea/model/user.py:418 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "Notification de réinitialisation du mot de passe" -#: kallithea/model/user.py:419 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " @@ -2063,21 +1802,21 @@ "Le mot de passe de votre compte %s a été changé via le formulaire de " "réinitialisation du mot de passe." -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "Cette valeur ne peut être une liste vide" -#: kallithea/model/validators.py:96 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Le nom d’utilisateur « %(username)s » existe déjà" -#: kallithea/model/validators.py:98 +#: kallithea/model/validators.py:75 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide" -#: kallithea/model/validators.py:100 +#: kallithea/model/validators.py:77 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" @@ -2086,25 +1825,25 @@ " des underscores (_), points, traits d'union et doit commencer avec un " "caractère alphanumérique ou un underscore" -#: kallithea/model/validators.py:127 +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "L'entrée n'est pas valide" -#: kallithea/model/validators.py:134 +#: kallithea/model/validators.py:111 #, python-format msgid "Username %(username)s is not valid" msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide" -#: kallithea/model/validators.py:154 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "Nom de groupe d'utilisateurs invalide" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:132 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Le groupe d'utilisateurs « %(usergroup)s » existe déjà" -#: kallithea/model/validators.py:157 +#: kallithea/model/validators.py:134 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -2113,65 +1852,65 @@ "alphanumériques, des tirets, des points, des traits d'union et doit " "commencer avec un caractère alphanumérique" -#: kallithea/model/validators.py:197 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "Impossible d’assigner ce groupe en tant que parent" -#: kallithea/model/validators.py:198 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Le groupe « %(group_name)s » existe déjà" -#: kallithea/model/validators.py:200 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Un dépôt portant le nom « %(group_name)s » existe déjà" -#: kallithea/model/validators.py:258 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "Caractères incorrects (non-ASCII) dans le mot de passe" -#: kallithea/model/validators.py:273 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "Ancien mot de passe invalide" -#: kallithea/model/validators.py:289 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "Les mots de passe ne correspondent pas" -#: kallithea/model/validators.py:304 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "Nom d'utilisateur ou mot de passe invalide" -#: kallithea/model/validators.py:335 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "Jeton d’authentification incorrect" -#: kallithea/model/validators.py:351 +#: kallithea/model/validators.py:326 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "Le nom de dépôt « %(repo)s » n’est pas autorisé" -#: kallithea/model/validators.py:353 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Un dépôt portant le nom « %(repo)s » existe déjà" -#: kallithea/model/validators.py:354 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Le dépôt « %(repo)s » existe déjà dans le groupe « %(group)s »" -#: kallithea/model/validators.py:356 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Un groupe de dépôts avec le nom « %(repo)s » existe déjà" -#: kallithea/model/validators.py:470 +#: kallithea/model/validators.py:449 msgid "Invalid repository URL" msgstr "URL de dépôt invalide" -#: kallithea/model/validators.py:471 +#: kallithea/model/validators.py:450 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" @@ -2179,40 +1918,40 @@ "URL de dépôt invalide. Ce doit être une URL valide de type http, https, " "ssh, svn+http ou svn+https" -#: kallithea/model/validators.py:496 +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "Le fork doit être du même type que le parent" -#: kallithea/model/validators.py:511 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "Vous n’avez pas la permission de créer un dépôt dans ce" -#: kallithea/model/validators.py:513 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "pas de permission de créer un dépôt dans la racine" -#: kallithea/model/validators.py:563 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "Vous n'avez pas les permissions pour créer un groupe dans cet endroit" -#: kallithea/model/validators.py:604 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "Ce nom d'utilisateur ou nom de groupe d'utilisateurs n'est pas valide" -#: kallithea/model/validators.py:697 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "Ceci n’est pas un chemin valide" -#: kallithea/model/validators.py:714 +#: kallithea/model/validators.py:692 msgid "This email address is already in use" msgstr "Cette adresse e-mail est déjà enregistrée" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:712 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "L’adresse e-mail « %(email)s » n’existe pas" -#: kallithea/model/validators.py:771 +#: kallithea/model/validators.py:749 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -2220,285 +1959,272 @@ "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom" " d’utilisateur" -#: kallithea/model/validators.py:783 +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Veuillez entrer une adresse IPv4 ou IPv6 valide" -#: kallithea/model/validators.py:784 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "La taille du réseau (bits) doit être entre 0 et 32 (et non %(bits)r)" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" "Le nom de la clé ne peut consister que de letters, de traits d'union, de " "tirets ou de nombres" -#: kallithea/model/validators.py:831 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "Le nom du fichier ne peut être à l'intérieur d'un répertoire" -#: kallithea/model/validators.py:847 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" "Les greffons %(loaded)s et %(next_to_load)s exportent tous les deux vers " "le même nom" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "À propos" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "Tableau de bord" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "Filtre rapide…" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "Dépôts" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "Ajouter un dépôt" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "Ajouter un groupe de dépôts" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "Vous avez les droits d'administration sur ce groupe, et pouvez l'éditer" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "Modifier le groupe de dépôts" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "Nom du groupe" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +#, fuzzy +#| msgid "Repository group" +msgid "Repository Group" +msgstr "Groupe de dépôt" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "Description" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "Nom" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "Dépôt" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "Dernière modification" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" msgstr "Sommet" -#: kallithea/templates/index_base.html:132 +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:244 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "Propriétaire" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "Tri ascendant" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "Tri descendant" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "Pas de dépôts trouvés." - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "Erreur d’intégrité des données." - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "Chargement…" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:414 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "Connexion" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "Se connecter à %s" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "Nom d’utilisateur" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "Mot de passe" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "Se souvenir de moi" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "Mot de passe oublié ?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "Vous n’avez pas de compte ?" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "Connexion" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "Remettre le mot de passe à zéro" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 #, python-format msgid "Reset Your Password to %s" msgstr "Réinitialiser votre mot de passe à %s" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 msgid "Reset Your Password" msgstr "Réinitialiser votre mot de passe" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "Adresse e-mail" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "Captcha" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 msgid "Send Password Reset Email" msgstr "Envoyer l'E-mail de réinitialisation du mot de passe" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." @@ -2506,14 +2232,16 @@ "Un lien de réinitialisation du mot de passe sera envoyé à l'adresse " "e-mail indiquée si elle est enregistrée dans le système." -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" "Vous êtes sur le point de changer le mot de passe pour l'adresse e-mail " "%s." -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." @@ -2521,102 +2249,123 @@ "Vous devez utiliser la même session de navigateur pour cette opération " "que celle utilisée pour la demande de réinitialisation de mot de passe." -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "Le code que vous avez reçu dans l'e-mail" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 msgid "New Password" msgstr "Nouveau mot de passe" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 msgid "Confirm New Password" msgstr "Confirmer le nouveau mot de passe" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "Confirmation" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "Inscription" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "S'inscrire sur %s" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "Confirmation" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "Prénom" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "Nom" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "E-mail" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "" "Les comptes enregistrés sont prêts à être utilisés, et ne nécessitent " "aucune autre action." -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "Merci d'attendre qu'un administrateur active votre compte." -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "Aucune branche n’a été créée pour le moment" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "Aucun tag n’a été créé pour le moment" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "Aucun signet n’a été créé" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 msgid "Admin Journal" msgstr "Historique d’administration" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "filtre du journal…" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 msgid "Filter" msgstr "Filtre" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2624,59 +2373,60 @@ msgstr[1] "%s entrées" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "Action" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "Dépôt" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "Date" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "Depuis l’adresse IP" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "Aucune action n’a été enregistrée pour le moment" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "Réglages d'authentification" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "Authentification" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "Greffons d'authentification" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "Greffons activés" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" @@ -2685,57 +2435,78 @@ "est aussi celui dans lequel Kallithea va essayer d'authentifier un " "utilisateur" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "Greffons inclus disponibles" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "Greffon" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "Enregistrer" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 msgid "Repository Defaults" msgstr "Réglages par défaut du dépôt" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "Type" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 msgid "Private repository" msgstr "Dépôt privé" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -2743,34 +2514,40 @@ "Les dépôts privés sont visibles seulement par les utilisateurs ajoutés " "comme collaborateurs." -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 msgid "Enable statistics" msgstr "Activer les statistiques" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 msgid "Enable statistics window on summary page." msgstr "Afficher les statistiques sur la page du dépôt." -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 msgid "Enable downloads" msgstr "Activer les téléchargements" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 msgid "Enable download menu on summary page." msgstr "Afficher le menu de téléchargements sur la page du dépôt." -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 msgid "Enable locking" msgstr "Activer le verrouillage" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "Activer le verrouillage lors d’un pull sur le dépôt." @@ -2779,7 +2556,7 @@ msgid "Edit Gist" msgstr "Modifier le gist" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " @@ -2788,309 +2565,464 @@ "Le gist a été mis à jour depuis que vous avez commencé à éditer. Copier " "vos changements et cliquez %(here)s pour charger la nouvelle version." -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "Description du gist…" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "Durée de vie du gist" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" msgstr "Expire le" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 msgid "Never" msgstr "Jamais" -#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "Mettre à jour le gist" -#: kallithea/templates/admin/gists/edit.html:147 -#: kallithea/templates/changeset/changeset_file_comment.html:105 +#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "Annuler" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, python-format msgid "Private Gists for User %s" msgstr "Gists privés de l'utilisateur %s" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, python-format msgid "Public Gists for User %s" msgstr "Gists publiques de l'utilisateur %s" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "Gists publics" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "Créer un nouveau gist" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "Créé" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "Il n'y a actuellement pas de gists" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "Nouveau gist" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." +#: kallithea/templates/admin/gists/new.html:45 +#, fuzzy +#| msgid "name this file..." +msgid "Name this gist ..." msgstr "nommez ce fichier…" -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "Créer un gist privé" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "Créer un gist public" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "Réinitialiser" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "Gist" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "URL" -#: kallithea/templates/admin/gists/show.html:37 +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 msgid "Public Gist" msgstr "Gist public" -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/templates/admin/gists/show.html:37 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "Gist privé" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:31 -#: kallithea/templates/changeset/changeset_file_comment.html:95 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "Supprimer" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "Confirmer la supprisson de ce gist" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "Modifier" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "Modifier" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "Montrer en brut" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "créé" -#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "Montrer en brut" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:431 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "Mon compte" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "Profil" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 msgid "Email Addresses" msgstr "Adresses e-mail" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "Clés de l'API" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 msgid "Owned Repositories" msgstr "Dépôts possédés" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 msgid "Watched Repositories" msgstr "Dépôts surveillés" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 msgid "Show Permissions" msgstr "Afficher les permissions" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "Inclus" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, python-format msgid "Confirm to reset this API key: %s" msgstr "Confirmer la remise à zéro de cette clé d'API : %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 msgid "Expired" msgstr "a expiré" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, python-format msgid "Confirm to remove this API key: %s" msgstr "Confirmer la suppression de cette clé d'API : %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 msgid "Remove" msgstr "Supprimer" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 msgid "No additional API keys specified" msgstr "Pas de clés d'API supplémentaires spécifiées" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 msgid "New API key" msgstr "Nouvelle clé d'API" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "Ajouter" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "Primaire" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "Veuillez confirmer la suppression de l’e-mail : %s" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 msgid "No additional emails specified." msgstr "Pas d'adresse email supplémentaires spécifiées." -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "Nouvelle adrese" @@ -3098,123 +3030,165 @@ msgid "Change Your Account Password" msgstr "Changer le mot de passe de votre compte" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "Mot de passe actuel" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "Nouveau mot de passe" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "Confirmer le nouveau mot de passe" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "Ce compte est géré avec %s et le mot de passe ne peut pas être changé ici" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" -msgstr "Vous pouvez changer votre avatar sur" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +msgid "Current IP" +msgstr "Adresse IP actuelle" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, fuzzy, python-format +#| msgid "Change avatar at" +msgid "Change %s avatar at" +msgstr "Changer l'avatar sur" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "en utilisant l’adresse" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "Les avatars sont désactivés" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "Adresse courriel manquante, veuillez mettre à jour votre adresse courriel." - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "Adresse IP actuelle" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 msgid "Repositories You Own" msgstr "Dépôts dont vous êtes le propriétaire" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "Aucun élément n’a été trouvé." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" +msgstr "Nom" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 msgid "Repositories You are Watching" msgstr "Dépôts que vous surveillez" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "Mes notifications" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "Tous" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "Commentaires" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "Demandes de pull" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 msgid "Mark All Read" msgstr "Tout marquer comme lu" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +#, fuzzy +#| msgid "Mark All Read" +msgid "Mark as read" +msgstr "Tout marquer comme lu" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "Aucune notification pour le moment" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 msgid "Show Notification" msgstr "Montrer Notification" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:430 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "Notifications" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 msgid "Default Permissions" msgstr "Permissions par défaut" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "Global" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "Liste blanche d'adresses IP" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "Accès anonyme" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " @@ -3223,7 +3197,8 @@ "Autoriser l'accès à Kallithea sans le besoin de se connecter. Les " "utilisateurs anonymes ont les permissions de l'utilisateur %s." -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " @@ -3233,23 +3208,29 @@ "réinitialisées aux valeurs choisies. Notez que toutes les permissions par" " défaut personnalisées sur les dépôts seront perdues" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 msgid "Apply to all existing repositories" msgstr "Appliquer à tous les dépôts existants" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 msgid "Permissions for the Default user on new repositories." msgstr "Permissions pour l'utilisateur par défaut sur les nouveaux dépôts." -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 msgid "Repository group" msgstr "Groupe de dépôt" -#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " @@ -3259,22 +3240,27 @@ "réinitialisées aux valeurs choisies. Notez que toutes les permissions par" " défaut personnalisées sur les groupes de dépôts seront perdues" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 msgid "Apply to all existing repository groups" msgstr "Appliquer à tous les groupes de dépôts existants" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 msgid "Permissions for the Default user on new repository groups." msgstr "" "Permissions pour l'utilisateur par défaut sur les nouveaux groupes de " "dépôts." -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "Groupe d'utilisateurs" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " @@ -3285,27 +3271,32 @@ "permissions par défaut personnalisées sur les groupes d'utilisateurs " "seront perdues" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "Appliquer à tous les groupes d'utilisateurs existants" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 msgid "Permissions for the Default user on new user groups." msgstr "" "Permissions pour l'utilisateur par défaut sur les nouveaux groupes " "d'utilisateurs." -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 msgid "Top level repository creation" msgstr "Création de dépôt de niveau supérieur" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 msgid "Enable this to allow non-admins to create repositories at the top level." msgstr "" "Activer pour autoriser les non-administrateurs à créer des dépôts au " "niveau supérieur." -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." @@ -3314,11 +3305,13 @@ "pour créer des dépôts partout. Ce comportement peut changer dans des " "versions futures." -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 msgid "Repository creation with group write access" msgstr "Création de dépôts avec l'accès en écriture du groupe" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " @@ -3328,75 +3321,97 @@ "créer des dépôts dans ce groupe. Sans ceci, le droit d'écriture pour les " "groupes n'a pas d'impact." -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 msgid "User group creation" msgstr "Création de groupes d'utilisateurs" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 msgid "Enable this to allow non-admins to create user groups." msgstr "" "Activer pour autoriser les non-administrateurs à créer des groupes " "d'utilisateurs." -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "Fork de dépôt" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "Activer pour autoriser les non-administrateurs à faire des fork de dépôt." -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "Enregistrement" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "Activation de l'authentification externe" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, python-format msgid "Confirm to delete this IP address: %s" msgstr "Confirmer la suppression de cette adresse IP : %s" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 msgid "All IP addresses are allowed." msgstr "Toutes les adresses IP sont autorisées." -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "Nouvelle adresse IP" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "Groupes de dépôts" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "Nom de groupe" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "Parent du groupe" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "Copier les permissions du groupe parent" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "Copier les permissions à partir du groupe de dépôts parent." @@ -3405,31 +3420,42 @@ msgid "%s Repository Group Settings" msgstr "Options du groupe de dépôts %s" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "Ajouter un groupe enfant" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "Options" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "Avancé" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "Permissions" @@ -3453,12 +3479,14 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "Créé le" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3469,16 +3497,38 @@ msgid "Delete this repository group" msgstr "Supprimer ce groupe de dépôts" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "disabled" +msgid "Visible" +msgstr "désactivé" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "Add Repository" +msgid "Add repos" +msgstr "Ajouter un dépôt" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#, fuzzy +#| msgid "Add user group" +msgid "Add/Edit groups" +msgstr "Ajouter un groupe d'utilisateurs" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "Utilisateur/groupe d'utilisateurs" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3486,28 +3536,28 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "Révoquer" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "Ajouter un nouveau" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "Appliquer aux enfants" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "Les deux" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." @@ -3515,7 +3565,7 @@ "Ajouter ou révoquer la permission pour tous les enfants de ce groupe, y " "compris les dépôts non-privés et les autres groupes si sélectionné." -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" @@ -3523,40 +3573,47 @@ "Activer le verrou lors d’un pull sur le groupe. Cette option sera " "appliquée à tous les sous-groupes et dépôts de ce groupe" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "Supprimer ce groupe" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "Confirmer la suppression de ce groupe" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "Tableau de bord du groupe de dépôts %s" +#, fuzzy, python-format +#| msgid "Repository Group: %s" +msgid "Repository group %s" +msgstr "Groupe de dépôts : %s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "Accueil" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "comprenant" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 msgid "Repository Groups Administration" msgstr "Administration des groupes de dépôts" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 msgid "Number of Top-level Repositories" msgstr "Nombre de dépôts de niveau supérieur" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 msgid "Clone remote repository" msgstr "Cloner le dépôt distant" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." @@ -3564,31 +3621,36 @@ "Optionnel : URL d'un dépôt distant. Si renseigné, le dépôt sera créé " "comme un clone à partir de cette URL." -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Gardez cette description précise et concise. Utilisez un fichier README " "pour des descriptions plus détaillées." -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt." -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "Type de dépôt à créer." -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "Révision d’arrivée" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3624,56 +3686,69 @@ "journaux du serveur Kallithea, ou contactez votre administrateur." #: kallithea/templates/admin/repos/repo_edit.html:8 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, python-format msgid "%s Repository Settings" msgstr "Réglages du dépôt %s" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 msgid "Extra Fields" msgstr "Champs supplémentaires" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "Caches" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "Dépôt distant" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "Statistiques" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 msgid "Parent" msgstr "Parent" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "Appliquer" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 msgid "Manually set this repository as a fork of another from the list." msgstr "Marquer manuellement ce dépôt comme fork d’un autre dépôt de la liste." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 msgid "Public Journal Visibility" msgstr "Visibilité du journal public" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "Supprimer du journal public" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 msgid "Add to Public Journal" msgstr "Ajouter au journal public" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." @@ -3681,36 +3756,44 @@ "Les actions réalisées sur ce dépôt seront visibles à tous depuis le " "journal public." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 msgid "Change Locking" msgstr "Changer le verrouillage" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 msgid "Confirm to unlock repository." msgstr "Veuillez confirmer le déverrouillage de ce dépôt." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 msgid "Unlock Repository" msgstr "Déverrouiller le dépôt" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 #, python-format msgid "Locked by %s on %s" msgstr "Verrouillé par %s sur %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 msgid "Confirm to lock repository." msgstr "Veuillez confirmer le verrouillage de ce dépôt." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 msgid "Lock Repository" msgstr "Verrouiller le dépôt" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "Ce dépôt n’est pas verrouillé" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3722,32 +3805,39 @@ "L'utilisateur qui fait le pull verrouille le dépôt ; seul l'utilisateur " "qui a fait le pull et a verrouillé peut déverrouiller en faisant un push." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Voulez-vous vraiment supprimer le dépôt %s ?" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 msgid "Delete this Repository" msgstr "Supprimer ce dépôt" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "Ce dépôt a %s fork" msgstr[1] "Ce dépôt a %s forks" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "Détacher les forks" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "Supprimer les forks" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3761,7 +3851,7 @@ msgid "Invalidate Repository Cache" msgstr "Invalider le cache du dépôt" -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." @@ -3769,95 +3859,105 @@ "Invalider manuellement le cache de ce dépôt. Au prochain accès sur ce " "dépôt, il sera à nouveau mis en cache." -#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 msgid "List of Cached Values" msgstr "Liste des valeurs en cache" -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "Prefix" msgstr "Préfixe" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "Clé" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "Actif" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "Libellé" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "Voulez-vous vraiment supprimer ce champ : %s ?" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "Clé du nouveau champ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "Libellé du nouveau champ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "Saisir un libellé court" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "Description du nouveau champ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "Saisir la description du champ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "Les champs supplémentaires sont désactivés." -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 msgid "Private Repository" msgstr "Dépôt privé" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "[forked] repository" +msgid "Fork of repository" +msgstr "[a forké] le dépôt" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 msgid "Remote repository URL" msgstr "URL du dépôt distant" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" msgstr "Récupérer les modifications depuis le dépôt distant" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 msgid "Confirm to pull changes from remote repository." msgstr "Voulez-vous vraiment récupérer les changements depuis le dépôt distant ?" -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "Ce dépôt n'a pas d'URL de dépôt distant." -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" msgstr "ID permanent du dépôt" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "Qu'est-ce que c'est ?" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "URL par id" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3874,15 +3974,15 @@ "d'intégration continue, ou dans tous les cas où vous devez saisir l'URL " "« en dur » dans un service tiers." -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 msgid "Remote repository" msgstr "Dépôt distant" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" msgstr "URL du dépôt" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." @@ -3890,21 +3990,21 @@ "Optionel : URL d'un dépôt distant. Si renseigné, le dépôt sera pullé à " "partir de cette URL." -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" "Révision par défaut pour les pages de fichiers, de téléchargements, de " "recherche et de documentation" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "Changer le propriétaire de ce dépôt." +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "Commits traités" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "Commits traités" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "Avancement" @@ -3917,87 +4017,110 @@ msgstr "Souhaitez-vous vraiment réinitialiser les statistiques de ce dépôt ?" #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 msgid "Repositories Administration" msgstr "Administration des dépôts" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "État" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 msgid "Settings Administration" msgstr "Administration des options" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "VCS" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "Mapper et scanner" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "Visuel" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "Hooks" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "Recherche dans le texte complet" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "Informations sytème" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "Envoyer un courriel de test à" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "Envoyer" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "Nom du site" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "Mettez un title personnalisé pour votre service Kallithea." + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "Mettez un title personnalisé pour votre service Kallithea." - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "Domaine d'authentification HTTP (realm)" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "Bloc HTML pour l'analytique" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" -"HTML avec du JavaScript pour les systèmes d'analyse Web comme Google " -"Analytics ou Piwik. Ceci sera ajouté en bas de chaque page." - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems like Google" +" Analytics or Piwik, but also to perform " +"instance-specific customizations like adding a " +"project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "Clé publique ReCaptcha" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "Clé publique pour le système reCaptcha." -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "Clé privée ReCaptcha" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." @@ -4005,17 +4128,22 @@ "Clé privée pour le système reCaptcha. Définir cette valeur activera le " "captcha à l'enregistrement." -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 msgid "Save Settings" msgstr "Enregistrer les options" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "Hooks Mercurial intégrés (lecture seule)" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." @@ -4025,22 +4153,28 @@ "fonctions Python ou des applications externes." #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 msgid "Custom Hooks" msgstr "Hooks personnalisés" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "Erreur lors de la suppression du hook" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Rescan option" +msgid "Rescan options" msgstr "Option de scan" -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 msgid "Delete records of missing repositories" msgstr "Supprimer les enregistrements de dépôts manquants" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 msgid "" "Check this option to remove all comments, pull requests and other records" " related to repositories that no longer exist in the filesystem." @@ -4050,18 +4184,22 @@ "le système de fichiers." #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "Invalider le cache pour tous les dépôts" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "Cocher pour recharger les données et vider le cache pour tous les dépôts." -#: kallithea/templates/admin/settings/settings_mapping.html:23 +#: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 msgid "Install Git hooks" msgstr "Installer des hooks Git" -#: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." @@ -4069,11 +4207,13 @@ "Vérifier si les hooks Git de Kallithea sont installés pour chaque dépôt. " "Les hooks actuels seront mis à jour vers la dernière version." -#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 msgid "Overwrite existing Git hooks" msgstr "Écraser les hooks Git existants" -#: kallithea/templates/admin/settings/settings_mapping.html:30 +#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " "not seem to come from Kallithea. WARNING: This operation will destroy any" @@ -4083,19 +4223,23 @@ "même s'ils ne semblent pas provenir de Kallithea. ATTENTION : cette " "opération détruira tous les hooks Git que vous avez déployés à la main !" -#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/templates/admin/settings/settings_mapping.html:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "Relancer le scan des dépôts" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "Option de construction de l'index" -#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 msgid "Build from scratch" msgstr "Construire ex nihilo" -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." @@ -4103,100 +4247,103 @@ "Cette option ré-indexe complètement tous les dépôts pour pouvoir faire " "des recherches dans le texte complet." -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "Mettre à jour l’index" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." +msgstr "Vérification des mises à jour…" + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 msgid "Kallithea version" msgstr "Version de Kallithea" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 msgid "Check for updates" msgstr "Vérifier les mises à jour" -#: kallithea/templates/admin/settings/settings_system.html:5 +#: kallithea/templates/admin/settings/settings_system.html:8 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 msgid "Kallithea configuration file" msgstr "Fichier de configuration de Kallithea" -#: kallithea/templates/admin/settings/settings_system.html:6 +#: kallithea/templates/admin/settings/settings_system.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 msgid "Python version" msgstr "Version de Python" -#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 msgid "Platform" msgstr "Plateforme" -#: kallithea/templates/admin/settings/settings_system.html:8 +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 msgid "Git version" msgstr "Version de Git" -#: kallithea/templates/admin/settings/settings_system.html:9 +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 msgid "Git path" msgstr "Chemin de Git" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Upgrade info endpoint" msgstr "Point d'accès aux informations de mise à jour" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "Note : vérifiez que le serveur peut accéder cette URL" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "Vérification des mises à jour…" - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "Paquets Python" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "Web" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "Nécessiter SSL pour les opérations de VCS" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" -"Activez pour faire en sorte que Kallithea force l'utilisation de SSL pour" -" pousser ou tirer. Si le certificat SSL est manquant, une erreur « HTTP " -"406: Not Acceptable » sera renvoyée." - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "Afficher la taille du dépôt après un push" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "Journaliser les commandes de push" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "Journaliser les commandes de pull" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "Mettre à jour les dépôts après un push (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 msgid "Mercurial extensions" msgstr "Extensions Mercurial" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 msgid "Enable largefiles extension" msgstr "Activer l'extension largefiles" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 msgid "Enable hgsubversion extension" msgstr "Activer l'extension hgsubversion" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." @@ -4204,11 +4351,13 @@ "La bibliothèque hgsubversion doit être installée. Elle permet de cloner " "des dépôts SVN distants et de les migrer vers Mercurial." -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 msgid "Location of repositories" msgstr "Emplacement des dépôts" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting" " take effect." @@ -4216,7 +4365,8 @@ "Cliquez pour déverrouiller. Vous devez redémarrer Kallithea pour ce que " "réglage prenne effet." -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -4225,33 +4375,39 @@ "modification de cette valeur nécessite un re-démarrage et un nouveau " "scan." -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "Général" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "Activer les champs supplémentaires sur les dépôts" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "" "Permet d'enregistrer des champs personnalisés additionnels pour chaque " "dépôt." -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "Afficher la version de Kallithea" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "Afficher ou cacher le numéro de version de Kallithea dans le pied de page." -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "Utiliser Gravatar sur Kallithea" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4283,22 +4439,38 @@ " {netloc} " "emplacement réseau/hôte du serveur Kallithea en cours d'utilisation." -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +msgid "Clone URL" +msgstr "URL de clone" + +#: kallithea/templates/admin/settings/settings_visual.html:43 +#, fuzzy +#| msgid "" "Schema of clone URL construction eg. +#| '{scheme}://{user}@{netloc}/{repo}'." "\n" " +#| The following " "variables are available:\n" " +#| {scheme} 'http' " "or 'https' sent from running Kallithea server,\n" " +#| {user} current " "user username,\n" " +#| {netloc} network " "location/server host of running Kallithea server,\n" " +#| {repo} full " "repository name,\n" " +#| {repoid} ID of " "repository, can be used to contruct clone-by-id" msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." "\n" -" The following " +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user" +" username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" msgstr "" "Modèle de construction d'URL de clone. Par exemple : " "'{scheme}://{user}@{netloc}/{repo}'.\n" @@ -4316,23 +4488,31 @@ " {repoid} ID du" " dépôt, peut être utilisé pour cloner par ID." -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "Élements du tableau de bord" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repository Size" +msgid "Repository page size" +msgstr "Taille du dépôt" + +#: kallithea/templates/admin/settings/settings_visual.html:57 +#, fuzzy +#| msgid "" "Number of items displayed in the admin pages grids before +#| pagination is " "shown." msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." -msgstr "" -"Nombre d'éléments affichés dans la page principale du tableau de bord " -"avant d'afficher la pagination." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" +"Nombre d'éléments affichés dans les grilles des pages admin avant " +"d'afficher la pagination." + +#: kallithea/templates/admin/settings/settings_visual.html:62 +#, fuzzy +#| msgid "Admin pages items" +msgid "Admin page size" +msgstr "Élements des pages admin" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "Élements des pages admin" - -#: kallithea/templates/admin/settings/settings_visual.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." @@ -4340,31 +4520,33 @@ "Nombre d'éléments affichés dans les grilles des pages admin avant " "d'afficher la pagination." -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 msgid "Icons" msgstr "Icônes" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 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 +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 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 +#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 msgid "Show public/private icons next to repository names." msgstr "Afficher l’icône « public/privé » à côté du nom des dépôts." -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 msgid "Meta Tagging" msgstr "Meta-tagging" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "Styliser les méta-tags reconnus :" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." @@ -4372,33 +4554,45 @@ "Analyser les méta-tags dans le champ de description du dépôt et les " "transformer en tags colorés." +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 +msgid "Stylify recognised meta tags:" +msgstr "Styliser les méta-tags reconnus :" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "Ajouter un groupe d'utilisateurs" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "Groupes d'utilisateurs" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "Ajouter un groupe d'utilisateurs" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "Description courte pour ce groupe d'utilisateur (optionnel)." #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "Réglages du groupe d'utilisateurs %s" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 msgid "Show Members" msgstr "Afficher les membres" @@ -4408,13 +4602,15 @@ msgstr "Groupe d'utilisateurs : %s" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "Membres" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "Voulez-vous vraiment supprimer ce groupe utilisateur : %s ?" @@ -4423,48 +4619,59 @@ msgid "Delete this user group" msgstr "Supprimer ce groupe d'utilisateurs" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "Aucun membre pour l'instant" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "Membres de groupe sélectionnés" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "Membres disponibles" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 msgid "User Groups Administration" msgstr "Administration des groupes d'utilisateurs" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "Ajouter un utilisateur" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "Utilisateurs" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "Ajouter un utilisateur" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "Confirmation" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "Réglages de l'utilisateur %s" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "E-mails" @@ -4474,12 +4681,14 @@ msgstr "Utilisateur : %s" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "Source de l'enregistrement" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "Dernière connexion" @@ -4488,7 +4697,8 @@ msgstr "Membre des groupes d'utilisateurs" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?" @@ -4497,218 +4707,254 @@ msgid "Delete this user" msgstr "Supprimer cet utilisateur" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "Hérité de %s" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "Changer l'avatar sur" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" -"E-mail manquant, veuillez mettre à jour l'adresse e-mail de cet " -"utilisateur." - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "Nom dans la source de l'enregistrement" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "Confirmation du nouveau mot de passe" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 msgid "Users Administration" msgstr "Administration des utilisateurs" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "Type d'authentification" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "Instance de serveur : %s" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "Support" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "Dépôt Mercurial" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "Dépôt Git" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 msgid "Create Fork" msgstr "Créer un fork" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "Résumé" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "Historique" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "Fichiers" -#: kallithea/templates/base/base.html:142 -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 msgid "Options" msgstr "Options" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:147 +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 msgid "Compare Fork" msgstr "Comparer le fork" -#: kallithea/templates/base/base.html:154 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 msgid "Compare" msgstr "Comparer" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:331 +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 msgid "Search" msgstr "Rechercher" -#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:155 +#: kallithea/tests/data/templates/base/base.html.py:399 msgid "Unlock" msgstr "Déverrouiller" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:157 +#: kallithea/tests/data/templates/base/base.html.py:405 msgid "Lock" msgstr "Verrouiller" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:165 +#: kallithea/tests/data/templates/base/base.html.py:413 msgid "Follow" msgstr "Suivre" -#: kallithea/templates/base/base.html:171 +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 msgid "Unfollow" msgstr "Arrêter de suivre" -#: kallithea/templates/base/base.html:174 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 msgid "Fork" msgstr "Fork" -#: kallithea/templates/base/base.html:175 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/base/base.html:170 +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 msgid "Create Pull Request" msgstr "Créer une requête de pull" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "Afficher les requêtes de pull pour %s" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 msgid "Switch To" msgstr "Basculer vers" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:485 +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 msgid "No matches found" msgstr "Aucune correspondance trouvée" -#: kallithea/templates/base/base.html:305 +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "Afficher l'activité récente" -#: kallithea/templates/base/base.html:311 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 msgid "Public journal" msgstr "Journal public" -#: kallithea/templates/base/base.html:317 +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 msgid "Show public gists" msgstr "Afficher les gists publics" -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:311 +#: kallithea/tests/data/templates/base/base.html.py:525 msgid "All Public Gists" msgstr "Tous les Gists publics" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 msgid "My Public Gists" msgstr "Mes Gists publics" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 msgid "My Private Gists" msgstr "Mes Gist privés" -#: kallithea/templates/base/base.html:330 +#: kallithea/templates/base/base.html:319 +#: kallithea/tests/data/templates/base/base.html.py:540 msgid "Search in repositories" msgstr "Recherche dans les dépôts" -#: kallithea/templates/base/base.html:353 -#: kallithea/templates/base/base.html:354 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 msgid "My Pull Requests" msgstr "Mes requêtes de pull" -#: kallithea/templates/base/base.html:377 +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 msgid "Not Logged In" msgstr "Non connecté" -#: kallithea/templates/base/base.html:384 +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 msgid "Login to Your Account" msgstr "Connexion à votre compte" +#: kallithea/templates/base/base.html:385 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" +msgstr "Mot de passe oublié ?" + +#: kallithea/templates/base/base.html:389 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "Vous n’avez pas de compte ?" + #: kallithea/templates/base/base.html:407 -msgid "Forgot password ?" -msgstr "Mot de passe oublié ?" - -#: kallithea/templates/base/base.html:434 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "Se déconnecter" -#: kallithea/templates/base/base.html:615 -msgid "Keyboard shortcuts" -msgstr "Raccourcis clavier" - -#: kallithea/templates/base/base.html:624 -msgid "Site-wide shortcuts" -msgstr "Raccourcis globaux" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 msgid "Inherit defaults" msgstr "Hériter des réglages par défaut" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " @@ -4717,223 +4963,248 @@ "Sélectionner pour hériter des réglages généraux, de la liste blanche d'IP" " et des permissions depuis les %s." -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "Création de dépôts" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 msgid "Select this option to allow repository creation for this user" msgstr "" "Sélectionner cette option pour autoriser cet utilisateur à créer des " "dépôts" -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "Créer des groupes d'utilisateurs" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "" "Sélectionner cette option pour autoriser cet utilisateur à créer des " "groupes d'utilisateurs" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "Forker les dépôts" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "" "Sélectionner cette option pour autoriser cet utilisateur à forker des " "dépôts" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "Afficher" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "Aucune permission définie pour l'instant" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "Permission" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "Éditer" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "Aucune permission définie" -#: kallithea/templates/base/root.html:22 +#: kallithea/templates/base/root.html:25 +#: kallithea/tests/data/templates/base/root.html.py:85 msgid "Add Another Comment" msgstr "Ajouter un autre commentaire" -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 +#: kallithea/templates/base/root.html:26 +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 msgid "Stop following this repository" msgstr "Arrêter de suivre ce dépôt" -#: kallithea/templates/base/root.html:24 +#: kallithea/templates/base/root.html:27 +#: kallithea/tests/data/templates/base/root.html.py:89 msgid "Start following this repository" msgstr "Suivre ce dépôt" -#: kallithea/templates/base/root.html:25 +#: kallithea/templates/base/root.html:28 +#: kallithea/tests/data/templates/base/root.html.py:91 msgid "Group" msgstr "Groupe" -#: kallithea/templates/base/root.html:26 +#: kallithea/templates/base/root.html:29 +#: kallithea/tests/data/templates/base/root.html.py:93 msgid "members" msgstr "Membres" -#: kallithea/templates/base/root.html:27 +#: kallithea/templates/base/root.html:30 +#: kallithea/tests/data/templates/base/root.html.py:95 msgid "Loading ..." msgstr "Chargement..." -#: kallithea/templates/base/root.html:28 +#: kallithea/templates/base/root.html:31 +#: kallithea/tests/data/templates/base/root.html.py:97 msgid "loading ..." msgstr "chargement..." -#: kallithea/templates/base/root.html:29 +#: kallithea/templates/base/root.html:32 +#: kallithea/tests/data/templates/base/root.html.py:99 msgid "Search truncated" msgstr "Recherche tronquée" -#: kallithea/templates/base/root.html:30 +#: kallithea/templates/base/root.html:33 +#: kallithea/tests/data/templates/base/root.html.py:101 msgid "No matching files" msgstr "Aucun fichier correspondant" -#: kallithea/templates/base/root.html:31 +#: kallithea/templates/base/root.html:34 +#: kallithea/tests/data/templates/base/root.html.py:103 msgid "Open New Pull Request from {0}" msgstr "Ouvrir une nouvelle requête de pull à partir de {0}" -#: kallithea/templates/base/root.html:32 +#: kallithea/templates/base/root.html:35 +#: kallithea/tests/data/templates/base/root.html.py:105 msgid "Open New Pull Request for {0} → {1}" msgstr "Ouvrir une nouvelle requête de pull pour {0} → {1}" -#: kallithea/templates/base/root.html:33 +#: kallithea/templates/base/root.html:36 +#: kallithea/tests/data/templates/base/root.html.py:107 msgid "Show Selected Changesets {0} → {1}" msgstr "Afficher les changesets sélectionnés {0} → {1}" -#: kallithea/templates/base/root.html:34 +#: kallithea/templates/base/root.html:37 +#: kallithea/tests/data/templates/base/root.html.py:109 msgid "Selection Link" msgstr "Lien vers la sélection" -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/base/root.html:38 +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 msgid "Collapse Diff" msgstr "Replier le Diff" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:39 +#: kallithea/tests/data/templates/base/root.html.py:113 msgid "Expand Diff" msgstr "Déplier le Diff" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:40 +#: kallithea/tests/data/templates/base/root.html.py:115 msgid "Failed to revoke permission" msgstr "Échec de la révocation de permission" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "Voulez-vous vraiment révoquer la permission pour {0} : {1} ?" -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "activé" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "désactivé" - -#: kallithea/templates/base/root.html:42 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "Sélectionner le changeset" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 msgid "Specify changeset" msgstr "Sélectionner le changeset" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "Signets de %s" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "Comparer les marque-pages" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "Auteur" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "Révision" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "Branches de %s" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "Comparer les branches" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "Tri ascendant" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "Tri descendant" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "Aucun élément n’a été trouvé." + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "Erreur d’intégrité des données." + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." +msgstr "Chargement…" #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "Historique de %s" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "Affichage de %d révision sur %d" msgstr[1] "Affichage de %d révisions sur %d" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "Vider la sélection" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 msgid "Go to tip of repository" msgstr "Aller au sommet (tip) du dépôt" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "Comparer le fork avec %s" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "Comparer le fork avec le dépôt parent (%s)" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 msgid "Branch filter:" msgstr "Filtre de branche :" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, python-format -#| msgid "" "Changeset status: %s\n" "Click to open associated pull request %s" +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 +#, python-format msgid "" "Changeset status: %s by %s\n" "Click to open associated pull request %s" @@ -4941,286 +5212,388 @@ "Statut du changeset : %s par %s\n" "Cliquer pour ouvrir la requête de pull %s associée" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/changelog/changelog_summary_data.html:24 -#, python-format -#| msgid "Changeset status: %s" +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 +#, python-format msgid "Changeset status: %s by %s" msgstr "Statut de changeset : %s par %s" -#: kallithea/templates/changelog/changelog.html:116 -#: kallithea/templates/compare/compare_cs.html:63 +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 msgid "Expand commit message" msgstr "Développer le message de commit" -#: kallithea/templates/changelog/changelog.html:125 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/changelog/changelog.html:116 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "Le changeset a des commentaires" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:57 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "Marque-page %s" -#: kallithea/templates/changelog/changelog.html:141 -#: kallithea/templates/changelog/changelog_summary_data.html:63 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#: kallithea/templates/compare/compare_cs.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:203 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "Tag %s" -#: kallithea/templates/changelog/changelog.html:146 -#: kallithea/templates/changelog/changelog_summary_data.html:68 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "Branche %s" -#: kallithea/templates/changelog/changelog.html:311 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "Il n’y a aucun changement pour le moment" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "Supprimé" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "Modifié" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:47 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "Ajouté" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "%s fichiers affectés" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "Révision" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "Message de commit" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "Âge" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "Auteur" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "Refs" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "Ajouter ou téléverser des fichiers directement via Kallithea" -#: kallithea/templates/changelog/changelog_summary_data.html:87 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "Ajouter un nouveau fichier" -#: kallithea/templates/changelog/changelog_summary_data.html:93 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 msgid "Push new repository" msgstr "Pusher le nouveau dépôt" -#: kallithea/templates/changelog/changelog_summary_data.html:101 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "Le dépôt existe déjà ?" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "Changeset de %s" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "Révision parente" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "Révision fille" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:39 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "Statut du changeset" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "Diff brut" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "Diff patch" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:75 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "Télécharger le diff" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 msgid "Merge" msgstr "Fusion" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 msgid "Grafted from:" msgstr "Grafté depuis :" +#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 +msgid "Transplanted from:" +msgstr "Transplanté depuis :" + #: kallithea/templates/changeset/changeset.html:129 -msgid "Transplanted from:" -msgstr "Transplanté depuis :" - -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 msgid "Replaced by:" msgstr "Remplacé par :" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 msgid "Preceded by:" msgstr "Précédé par :" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:329 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "%s fichier changé" msgstr[1] "%s fichiers changés" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:62 -#: kallithea/templates/pullrequests/pullrequest_show.html:331 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "%s fichier changé avec %s insertions et %s suppressions" msgstr[1] "%s fichiers changés avec %s insertions et %s suppressions" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 msgid "Show full diff anyway" msgstr "Afficher le diff complet quand même" -#: kallithea/templates/changeset/changeset.html:231 -#: kallithea/templates/changeset/changeset.html:268 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 msgid "No revisions" msgstr "Aucune révision" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 msgid "on pull request" msgstr "sur la requête de pull" -#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 msgid "No title" msgstr "Aucun titre" -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 msgid "on this changeset" msgstr "sur ce changeset" -#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 msgid "Delete comment?" msgstr "Supprimer le commentaire ?" -#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 msgid "Status change" msgstr "Changement de statut" -#: kallithea/templates/changeset/changeset_file_comment.html:59 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 msgid "Commenting on line." msgstr "Création d’un commentaire sur la ligne." -#: kallithea/templates/changeset/changeset_file_comment.html:60 +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 msgid "" "Comments are in plain text. Use @username inside this text to notify " "another user." msgstr "" -"Les commentaires sont du texte brut. Utilisez @nomutilisateur dans ce texte " -"pour envoyer une notification à un autre utilisateur." +"Les commentaires sont du texte brut. Utilisez @nomutilisateur dans ce " +"texte pour envoyer une notification à un autre utilisateur." + +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 +msgid "Set changeset status" +msgstr "Modifier le statut du changeset" #: kallithea/templates/changeset/changeset_file_comment.html:67 -msgid "Set changeset status" -msgstr "Modifier le statut du changeset" - -#: kallithea/templates/changeset/changeset_file_comment.html:69 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 msgid "Vote for pull request status" msgstr "Voter pour le statut de la requête de pull" -#: kallithea/templates/changeset/changeset_file_comment.html:75 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 msgid "No change" msgstr "Aucun changement" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 msgid "Finish pull request" msgstr "Terminer la requête de pull" -#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 msgid "Close" msgstr "Fermer" -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 msgid "Submitting ..." msgstr "Envoi…" -#: kallithea/templates/changeset/changeset_file_comment.html:104 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "Commentaire" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "Vous devez être connecté pour poster des commentaires." -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "Se connecter maintenant" -#: kallithea/templates/changeset/changeset_file_comment.html:116 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "Masquer" -#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d commentaire" msgstr[1] "%d commentaires" -#: kallithea/templates/changeset/changeset_file_comment.html:129 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "%d de ligne" msgstr[1] "%d de ligne" -#: kallithea/templates/changeset/changeset_file_comment.html:130 +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 #, python-format msgid "%d general" msgid_plural "%d general" @@ -5228,189 +5601,296 @@ msgstr[1] "%d généraux" #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "Changesets de %s" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "Statut de changeset : %s" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "Fichiers affectés" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "fichier supprimé" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "Non modifié" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 msgid "Deleted" msgstr "Supprimé" -#: kallithea/templates/changeset/diff_block.html:57 +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 msgid "Renamed" msgstr "Renommé" -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Révision %s inconnue" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Aucun nom de fichier" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "fichier ajouté" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "Afficher le diff complet pour ce fichier" -#: kallithea/templates/changeset/diff_block.html:69 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "Afficher le diff complet côte-à-côte pour ce fichier" -#: kallithea/templates/changeset/diff_block.html:83 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "Afficher les commentaires de ligne" #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "Aucun changeset" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "Ancêtre" - -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "Statut de changeset : %s" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +#, fuzzy +#| msgid "Common ancestor" +msgid "Merge Ancestor" +msgstr "Ancêtre commun" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "Premier changeset dans cette liste (le plus vieux)" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "Dernier changeset dans cette liste (le plus récent)" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "Position dans cette liste de changesets" -#: kallithea/templates/compare/compare_cs.html:85 +#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 msgid "Show merge diff" msgstr "Afficher le diff de fusion" -#: kallithea/templates/compare/compare_cs.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:321 -msgid "Common ancestor" -msgstr "Ancêtre commun" - -#: kallithea/templates/compare/compare_cs.html:99 -msgid "No common ancestor found - repositories are unrelated" -msgstr "Aucun ancêtre commun trouvé - les dépôts n'ont aucun lien entre eux" - -#: kallithea/templates/compare/compare_cs.html:107 +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 msgid "is" msgstr "est" -#: kallithea/templates/compare/compare_cs.html:108 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, python-format msgid "%s changesets" msgstr "Changesets de %s" -#: kallithea/templates/compare/compare_cs.html:109 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 msgid "behind" msgstr "derrière" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "Comparaison de %s" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "Comparer les révisions" #: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "Échanger" #: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "Comparer les révisions, les branches, les marque-pages ou les tags." #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "Affichage de %s commit" msgstr[1] "Affichage de %s commits" -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "Afficher le diff complet" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "Dépôt public" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "Création du dépôt en cours..." -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "Dépôt vide" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "S’abonner au flux RSS de %s" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "S’abonner au flux ATOM de %s" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "En cours de création" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "Le commentaire de %s sur le changeset de %s (%s) mentionne votre nom" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "%(user)s a commenté sur le changeset %(age)s" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "Comment from %s on %s changeset %s" +msgid "Comment on Changeset \"%s\"" msgstr "Commentaire de %s sur le changeset de %s (%s)" -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "Le statut du changeset a été changé en" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "Ceci est une notification automatique. Ne pas répondre à cet e-mail." - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset flow" +msgid "Changeset on" +msgstr "Flux des changesets" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Branche" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Changement de statut" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "This pull request has been closed and can not be updated." +msgid "The pull request has been closed." +msgstr "Cette pull request a été fermée et ne peut pas être mise à jour." + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "Bonjour %s" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 msgid "We have received a request to reset the password for your account." msgstr "" "Nous avons reçu une demande de réinitialisation du mot de passe de votre " "compte." -#: kallithea/templates/email_templates/password_reset.html:8 +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 msgid "" "This account is however managed outside this system and the password " "cannot be changed here." msgstr "" -"Cependant, ce compte est géré hors de ce système et le mot de passe ne peut " -"pas être changé ici." - -#: kallithea/templates/email_templates/password_reset.html:10 +"Cependant, ce compte est géré hors de ce système et le mot de passe ne " +"peut pas être changé ici." + +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 msgid "To set a new password, click the following link" msgstr "Pour choisir un nouveau mot de passe, cliquez sur le lien suivant" -#: kallithea/templates/email_templates/password_reset.html:13 +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" @@ -5418,7 +5898,9 @@ "Si vous ne pouvez pas utiliser le lien ci-dessus, merci de saisir le code" " suivant dans le formulaire de réinitialisation de mot de passe" -#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." @@ -5426,32 +5908,60 @@ "Si vous n'avez pas demandé la réinitialisation de votre mot de passe, ne " "tenez pas compte de ce message." -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, fuzzy, python-format +#| msgid "%s mentioned you on %s pull request \"%s\"" +msgid "Mention on Pull Request %s \"%s\" by %s" msgstr "%s a mentionné votre nom dans la requête de pull %s « %s »" -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, fuzzy, python-format +#| msgid "%s requested your review of %s pull request \"%s\"" +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" msgstr "%s vous demande de vérifier la requête de pull %s « %s »" +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "on pull request" +msgid "Pull request from" +msgstr "sur la requête de pull" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +#, fuzzy +#| msgid "Date" +msgid "at" +msgstr "Date" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" +msgstr "" + #: kallithea/templates/email_templates/pull_request_comment.html:4 -#, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "Commentaire de %s sur la requête de pull %s « %s »" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "Le commentaire a fermé la requête de pull avec le statut" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "Le commentaire a été fait avec le statut" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "Visualiser cet utilisateur ici" +#, fuzzy, python-format +#| msgid "%s mentioned you on %s pull request \"%s\"" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "%s a mentionné votre nom dans la requête de pull %s « %s »" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s from %s#%s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "Requête de pull %s depuis %s#%s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "[a commenté] la requête de pull pour" + +#: kallithea/templates/email_templates/registration.html:22 +#, fuzzy +#| msgid "Group name" +msgid "Full Name" +msgstr "Nom de groupe" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5469,82 +5979,104 @@ msgstr "Diff de fichier pour %s" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "Fichiers de %s" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "Ajout de fichiers pour %s" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "Emplacement" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "Saisir le nom du fichier..." -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "ou" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "Uploader un fichier" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "Créer un nouveau fichier" #: kallithea/templates/files/files_add.html:53 +#: kallithea/tests/data/templates/files/files_add.html.py:241 msgid "New file type" msgstr "Nouveau type de fichier" -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 msgid "Commit Changes" msgstr "Commiter les changements" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "Révision précédente" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "Révision suivante" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "Suivre la branche courante" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "Rechercher dans la liste des fichiers" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "Chargement de la liste des fichiers…" -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 msgid "Size" msgstr "Taille" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 msgid "Last Revision" msgstr "Dernière révision" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 msgid "Last Modified" msgstr "Dernière modification" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 msgid "Last Committer" msgstr "Dernier commiteur" @@ -5554,7 +6086,7 @@ msgstr "Suppression de fichiers pour %s" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "Supprimer le fichier" @@ -5567,113 +6099,133 @@ msgid "Edit file" msgstr "Éditer le fichier" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "Afficher l'annotation" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 msgid "Download as Raw" msgstr "Télécharger au format brut" -#: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "Source" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "Édition du fichier" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "%s auteur" msgstr[1] "%s auteurs" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "Diff par rapport à une révision" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "Afficher à une révision" -#: kallithea/templates/files/files_source.html:10 +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 msgid "Show Full History" msgstr "Afficher l'historique complet" -#: kallithea/templates/files/files_source.html:11 +#: kallithea/templates/files/files_source.html:10 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "Afficher les auteurs" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "Afficher la source" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, fuzzy, python-format +#| msgid "Edit on Branch:%s" +msgid "Edit on Branch: %s" msgstr "Éditer sur la branche : %s" -#: kallithea/templates/files/files_source.html:41 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 msgid "Editing binary files not allowed" msgstr "Édition de fichiers binaires interdite" -#: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 msgid "Editing files allowed only when on branch head revision" msgstr "" "Édition de fichiers autorisée uniquement sur la révision de tête (head) " "de la branche" -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/files/files_source.html:41 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "" "Suppression de fichiers autorisée uniquement sur la révision de tête " "(head) de la branche" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "Fichier binaire (%s)" -#: kallithea/templates/files/files_source.html:74 +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 msgid "File is too big to display." msgstr "Ce fichier est trop gros pour être affiché." -#: kallithea/templates/files/files_source.html:76 +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 msgid "Show full annotation anyway." msgstr "Afficher les annotations complètes quand même." -#: kallithea/templates/files/files_source.html:78 +#: kallithea/templates/files/files_source.html:73 +#: kallithea/tests/data/templates/files/files_source.html.py:133 msgid "Show as raw." msgstr "Afficher en tant que texte brut." #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "annotation" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "Retour" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "Aucun fichier à cet endroit" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "Followers de %s" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "Followers" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "A commencé à suivre le dépôt :" @@ -5682,72 +6234,82 @@ msgid "Fork repository %s" msgstr "Forker le dépôt %s" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "Nom du fork" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" "Révision par défaut pour les pages de fichiers, de téléchargements, de " "recherche et de documentation." -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "Privé" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "Copier les permissions" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "Copier les permissions depuis le dépôt forké" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "MÀJ après le clonage" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "Mettre à jour depuis la source après clonage" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "Forker ce dépôt" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "Forks de %s" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "Forks" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "Forké" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "Il n’y a pas encore de forks" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 msgid "ATOM journal feed" msgstr "Flux ATOM du journal" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "Flux RSS du journal" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "Mes dépôts" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "Aucune entrée pour le moment" @@ -5761,34 +6323,45 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 msgid "New Pull Request" msgstr "Nouvelle requête de pull" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "Titre" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "Résumer les modifications - ou laisser vide" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "Saisir une courte description de cette requête de pull" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "Flux des changesets" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "Dépôt d'origine" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "Dépôt de destination" @@ -5823,7 +6396,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "Fermée" @@ -5843,60 +6418,74 @@ "commentaires" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, python-format msgid "%s Pull Request %s" msgstr "%s Requête de pull %s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, python-format msgid "Pull request %s from %s#%s" msgstr "Requête de pull %s depuis %s#%s" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 msgid "Summarize the changes" msgstr "Résumer les changements" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "Résultat du vote des relecteurs" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "Statut de la requête de pull calculé à partir des votes" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "Statut de la requête de pull calculé à partir des votes" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "Pas encore relue par" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "%d relecteur" msgstr[1] "%d relecteurs" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "La requête de pull a été relue par tous les relecteurs" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 msgid "There are no reviewers" msgstr "Il n'y a aucun relecteur" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "Origine" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 msgid "on" msgstr "sur" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "Cible" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." @@ -5904,63 +6493,86 @@ "Ceci est juste une série de changesets, et n'a pas de cible ou de " "véritable ancêtre de fusion." -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "Puller les modifications" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "Mettre à jour" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 +#, fuzzy +#| msgid "Registration" +msgid "Next iteration" +msgstr "Enregistrement" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 msgid "Current revision - no change" msgstr "Révision courante - aucun changement" -#: kallithea/templates/pullrequests/pullrequest_show.html:215 +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 +#, fuzzy +#| msgid "" "Pull requests do not change once created. Select a revision and +#| save to " "replace this pull request with a new one." msgid "" -"Pull requests do not change once created. Select a revision and save to " -"replace this pull request with a new one." +"Pull request iterations do not change content once created. Select a " +"revision and save to make a new iteration." msgstr "" "Les requêtes de pull ne peuvent pas changer après leur création. " -"Sélectionner une révision puis sauvegarder afin de remplacer cette requête " -"de pull par une nouvelle." - -#: kallithea/templates/pullrequests/pullrequest_show.html:224 +"Sélectionner une révision puis sauvegarder afin de remplacer cette " +"requête de pull par une nouvelle." + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +msgid "Save Changes" +msgstr "Enregistrer les changements" + +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +msgid "Cancel Changes" +msgstr "Annuler les modifications" + +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 msgid "Pull Request Reviewers" msgstr "Relecteurs de la requête de pull" -#: kallithea/templates/pullrequests/pullrequest_show.html:249 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 msgid "Remove reviewer" msgstr "Supprimer le relecteur" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 msgid "Type name of reviewer to add" msgstr "Saisir le nom du relecteur à ajouter" -#: kallithea/templates/pullrequests/pullrequest_show.html:269 +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 msgid "Potential Reviewers" msgstr "Relecteurs potentiels" -#: kallithea/templates/pullrequests/pullrequest_show.html:272 +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 msgid "Click to add the repository owner as reviewer:" msgstr "Cliquer pour ajouter le propriétaire du dépôt comme relecteur :" -#: kallithea/templates/pullrequests/pullrequest_show.html:295 -msgid "Save Changes" -msgstr "Enregistrer les changements" +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 +msgid "Pull Request Content" +msgstr "Contenu de la requête de pull" #: kallithea/templates/pullrequests/pullrequest_show.html:296 -msgid "Save Updates as New Pull Request" -msgstr "" -"Sauvegarder les modifications entrantes en tant que nouvelle requête de pull" - -#: kallithea/templates/pullrequests/pullrequest_show.html:297 -msgid "Cancel Changes" -msgstr "Annuler les modifications" - -#: kallithea/templates/pullrequests/pullrequest_show.html:307 -msgid "Pull Request Content" -msgstr "Contenu de la requête de pull" +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +msgid "Common ancestor" +msgstr "Ancêtre commun" #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format @@ -5977,244 +6589,501 @@ msgid "Pull Requests to '%s'" msgstr "Requête de pull vers '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "Ouvrir une nouvelle requête de pull" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "Afficher les requêtes de pull vers %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "Afficher les requêtes de pull depuis '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" "Cacher les requêtes de pull fermées (afficher uniquement les requêtes de " "pull ouvertes)" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" "Afficher les requêtes de pull fermées (en plus des requêtes de pull " "ouvertes)" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "Requêtes de pull créées par moi" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +#, fuzzy +#| msgid "Pull Request Reviewers" +msgid "Pull Requests Needing My Review" +msgstr "Relecteurs de la requête de pull" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "Requêtes de pull auxquelles je participe" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "Recherche pour %s" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 msgid "Search in All Repositories" msgstr "Rechercher dans tous les dépôts" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "Termes de la recherches" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "Rechercher dans" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "Le contenu des fichiers" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "Les messages de commit" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "Les noms de fichiers" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "Permission refusée" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "Statistiques pour %s" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "Flux ATOM pour %s" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "Flux RSS pour %s" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "Activer" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "Statistiques obtenues : " -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "Fichiers" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "Afficher plus" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 msgid "commits" msgstr "commits" +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "fichiers ajoutés" + +#: kallithea/templates/summary/statistics.html:390 +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" +msgstr "fichiers modifiés" + #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "fichiers ajoutés" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" -msgstr "fichiers modifiés" +#: kallithea/tests/data/templates/summary/statistics.html.py:153 +msgid "files removed" +msgstr "fichiers supprimés" #: kallithea/templates/summary/statistics.html:393 -msgid "files removed" -msgstr "fichiers supprimés" +#: kallithea/tests/data/templates/summary/statistics.html.py:155 +msgid "commit" +msgstr "commit" + +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 +msgid "file added" +msgstr "fichier ajouté" #: kallithea/templates/summary/statistics.html:395 -msgid "commit" -msgstr "commit" +#: kallithea/tests/data/templates/summary/statistics.html.py:159 +msgid "file changed" +msgstr "fichié modifié" #: kallithea/templates/summary/statistics.html:396 -msgid "file added" -msgstr "fichier ajouté" - -#: kallithea/templates/summary/statistics.html:397 -msgid "file changed" -msgstr "fichié modifié" - -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "fichier supprimé" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "Résumé de %s" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "Dépôt verrouillé par %s" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "Dépôt déverrouillé" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "Fork de" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "Cloner depuis" +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 +msgid "Show by ID" +msgstr "Afficher par ID" + #: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "URL de clone" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/summary/summary.html.py:143 msgid "Show by Name" msgstr "Afficher par nom" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "Afficher par ID" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "Populaires" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 msgid "Download" msgstr "Téléchargements" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 msgid "There are no downloads yet" msgstr "Il n’y a pas encore de téléchargements proposés" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 msgid "Downloads are disabled for this repository" msgstr "Les téléchargements sont désactivés pour ce dépôt" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:108 +#: kallithea/tests/data/templates/summary/summary.html.py:190 msgid "Download as zip" msgstr "Télécharger en ZIP" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:112 +#: kallithea/tests/data/templates/summary/summary.html.py:194 msgid "Check this to download archive with subrepos" msgstr "Télécharger une archive contenant également les sous-dépôts éventuels" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:114 +#: kallithea/tests/data/templates/summary/summary.html.py:196 msgid "With subrepos" msgstr "Avec les sous-dépôts" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "Taille du dépôt" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "Flux" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 msgid "Latest Changes" msgstr "Derniers changements" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 msgid "Quick Start" msgstr "Démarrage rapide" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "Fichier Lisez-moi de la revision %s:%s" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "Télécharge %s comme %s" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "Tags de %s" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "Comparer les tags" +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "Tableau de bord" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "Nom du groupe" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "Se souvenir de moi" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "nommez ce fichier…" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "Vous pouvez changer votre avatar sur" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "en utilisant l’adresse" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "Adresse courriel manquante, veuillez mettre à jour votre adresse courriel." + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "Tableau de bord du groupe de dépôts %s" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "Option de scan" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "Web" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "Nécessiter SSL pour les opérations de VCS" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "" +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" +"Activez pour faire en sorte que Kallithea force l'utilisation de SSL pour" +" pousser ou tirer. Si le certificat SSL est manquant, une erreur « HTTP " +"406: Not Acceptable » sera renvoyée." + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "Utiliser Gravatar sur Kallithea" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +#, fuzzy +#| msgid "" "Schema of clone URL construction eg. +#| '{scheme}://{user}@{netloc}/{repo}'." "\n" " +#| The following " "variables are available:\n" " +#| {scheme} 'http' " "or 'https' sent from running Kallithea server,\n" " +#| {user} current " "user username,\n" " +#| {netloc} network " "location/server host of running Kallithea server,\n" " +#| {repo} full " "repository name,\n" " +#| {repoid} ID of " "repository, can be used to contruct clone-by-id" +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." +"\n" +" The following " +"variables are available:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" +"Modèle de construction d'URL de clone. Par exemple : " +"'{scheme}://{user}@{netloc}/{repo}'.\n" +" Les variables " +"suivantes sont disponibles :\n" +" {scheme} " +"'http' ou 'https' envoyé à partir du serveur Kallithea en cours " +"d'utilisation,\n" +" {user} nom de" +" l'utilisateur courant,\n" +" {netloc} " +"emplacement réseau/hôte du serveur Kallithea en cours d'utilisation,\n" +" {repo} nom " +"complet du dépôt,\n" +" {repoid} ID du" +" dépôt, peut être utilisé pour cloner par ID." + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "Élements du tableau de bord" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "" +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" +"Nombre d'éléments affichés dans la page principale du tableau de bord " +"avant d'afficher la pagination." + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "Élements des pages admin" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "Filtre rapide…" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "Changer l'avatar sur" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "" +"E-mail manquant, veuillez mettre à jour l'adresse e-mail de cet " +"utilisateur." + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "Raccourcis clavier" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "Raccourcis globaux" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "Mot de passe oublié ?" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "Ancêtre" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "Aucun ancêtre commun trouvé - les dépôts n'ont aucun lien entre eux" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "Le commentaire de %s sur le changeset de %s (%s) mentionne votre nom" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "Commentaire de %s sur le changeset de %s (%s)" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "Le statut du changeset a été changé en" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "Ceci est une notification automatique. Ne pas répondre à cet e-mail." + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "%s a mentionné votre nom dans la requête de pull %s « %s »" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "%s vous demande de vérifier la requête de pull %s « %s »" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "Commentaire de %s sur la requête de pull %s « %s »" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +msgid "The comment closed the pull request with status" +msgstr "Le commentaire a fermé la requête de pull avec le statut" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +msgid "The comment was made with status" +msgstr "Le commentaire a été fait avec le statut" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "Visualiser cet utilisateur ici" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "Éditer sur la branche : %s" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" +msgstr "Taille du dépôt" #~ msgid "No comments." #~ msgstr "Aucun commentaire." @@ -6246,11 +7115,6 @@ #~ msgid "No Files" #~ msgstr "Aucun fichier" -#~ msgid "" -#~ "_: \n" -#~ "" -#~ msgstr "" - #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "Le nom d’utilisateur « %(username)s » n’est pas autorisé" @@ -6263,12 +7127,6 @@ #~ msgid "invalid clone URL" #~ msgstr "URL de clonage invalide" -#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" -#~ msgstr "" - -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" -#~ msgstr "" - #~ msgid "Defaults" #~ msgstr "Par défaut" @@ -6329,21 +7187,9 @@ #~ msgid "Pull Changes from Remote Location" #~ msgstr "Récupérer les changements depuis le site distant" -#~ msgid "This repository does not have a remote URL set." -#~ msgstr "" - -#~ msgid "Non-changeable id" -#~ msgstr "" - #~ msgid "edit" #~ msgstr "éditer" -#~ msgid "new value" -#~ msgstr "" - -#~ msgid "URL used for doing remote pulls." -#~ msgstr "" - #~ msgid "Email prefix" #~ msgstr "Préfixe courriel" @@ -6383,60 +7229,18 @@ #~ msgid "Default permissions" #~ msgstr "Permissions par défaut" -#~ msgid "user groups" -#~ msgstr "" - -#~ msgid "Inherit from defaults" -#~ msgstr "" - -#~ msgid "show" -#~ msgstr "" - -#~ msgid "parent rev." -#~ msgstr "" - -#~ msgid "child rev." -#~ msgstr "" - -#~ msgid "no revisions" -#~ msgstr "" - #~ msgid "Status change from pull request" #~ msgstr "Changement de statut -> %s" -#~ msgid "Status change on changeset" -#~ msgstr "" - -#~ msgid "Comment on changeset" -#~ msgstr "" - -#~ msgid "revision" -#~ msgstr "" - #~ msgid "Mimetype" #~ msgstr "Type MIME" #~ msgid "My Repos" #~ msgstr "Mes dépôts" -#~ msgid "Latest vote: %s" -#~ msgstr "" - -#~ msgid "Nobody voted" -#~ msgstr "" - -#~ msgid "%s Pull Request #%s" -#~ msgstr "" - -#~ msgid "Pull request #%s from %s#%s" -#~ msgstr "" - #~ msgid "owner" #~ msgstr "Propriétaire" -#~ msgid "reviewer" -#~ msgstr "" - #~ msgid "Your new password" #~ msgstr "Votre nouveau mot de passe" @@ -6446,32 +7250,229 @@ #~ msgid "Open New Pull Request for Selected Changesets" #~ msgstr "Nouvelle requête de pull" -#~ msgid "Show Selected Changesets __S → __E" -#~ msgstr "" - -#~ msgid "We received a request to create a new password for your account." -#~ msgstr "" - -#~ msgid "You can generate it by clicking following URL" -#~ msgstr "" - -#~ msgid "Please ignore this email if you did not request a new password ." -#~ msgstr "" - #~ msgid "Created by" #~ msgstr "créé" +#~ msgid "Closed, replaced by %s ." +#~ msgstr "Fermé, remplacé par %s." + +#~ msgid "Closing." +#~ msgstr "Fermeture." + +#~ msgid "Changeset not found" +#~ msgstr "Ensemble de changements non trouvé" + +#~ msgid "Repository no access" +#~ msgstr "Aucun accès au dépôt" + +#~ msgid "Repository read access" +#~ msgstr "Accès en lecture au dépôt" + +#~ msgid "Repository write access" +#~ msgstr "Accès en écriture au dépôt" + +#~ msgid "Repository admin access" +#~ msgstr "Accès administrateur au dépôt" + +#~ msgid "Repository Group no access" +#~ msgstr "Aucun accès au groupe de dépôts" + +#~ msgid "Repository Group read access" +#~ msgstr "Accès en lecture au groupe de dépôts" + +#~ msgid "Repository Group write access" +#~ msgstr "Accès en écriture au groupe de dépôts" + +#~ msgid "Repository Group admin access" +#~ msgstr "Accès administrateur au groupe de dépôts" + +#~ msgid "Repository creation disabled" +#~ msgstr "Création de dépôt désactivée" + +#~ msgid "Repository creation enabled" +#~ msgstr "Création de dépôt activée" + +#~ msgid "Repository forking disabled" +#~ msgstr "Fork de dépôt désactivé" + +#~ msgid "Repository forking enabled" +#~ msgstr "Fork de dépôt activé" + +#~ msgid "Register disabled" +#~ msgstr "Enregistrement désactivé" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "Enregistrer un nouvel utilisateur Kallithea manuellement activé" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "Enregistrer un nouvel utilisateur Kallithea auto-activé" + +#~ msgid "Not Reviewed" +#~ msgstr "Pas encore relue" + +#~ msgid "Rejected" +#~ msgstr "Rejetée" + +#~ msgid "Under Review" +#~ msgstr "En cours de relecture" + +#~ msgid "Repository group no access" +#~ msgstr "Groupe de dépôts, pas d'accès" + +#~ msgid "Repository group read access" +#~ msgstr "Groupe de dépôts, accès en lecture" + +#~ msgid "Repository group write access" +#~ msgstr "Groupe de dépôts, accès en écriture" + +#~ msgid "Repository group admin access" +#~ msgstr "Groupe de dépôts, accès d'administration" + +#~ msgid "User group no access" +#~ msgstr "Groupe d'utilisateurs, pas d'accès" + +#~ msgid "User group read access" +#~ msgstr "Groupe d'utilisateurs, accès en lecture" + +#~ msgid "User group write access" +#~ msgstr "Groupe d'utilisateurs, accès en écriture" + +#~ msgid "User group admin access" +#~ msgstr "Groupe d'utilisateurs, accès d'administration" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "Création de groupes de dépôts désactivée" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "Création de groupes de dépôts activée" + +#~ msgid "User Group creation disabled" +#~ msgstr "Création de groupes d'utilisateurs désactivée" + +#~ msgid "User Group creation enabled" +#~ msgstr "Création de groupes d'utilisateurs activée" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "Enregistrement des utilisateurs avec activation de compte manuelle" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "Enregistrement des utilisateurs avec activation de compte automatique" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" +#~ "[Ajouté] Demande de pull %(pr_nice_id)s " +#~ "à partir de %(ref)s pour %(repo_name)s" + +#~ msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" +#~ "[Commentaire] Demande de pull %(pr_nice_id)s" +#~ " à partir de %(ref)s pour " +#~ "%(repo_name)s" + +#~ msgid "repositories" +#~ msgstr "Dépôts" + +#~ msgid "No repositories found." +#~ msgstr "Pas de dépôts trouvés." + +#~ msgid "There are no branches yet" +#~ msgstr "Aucune branche n’a été créée pour le moment" + +#~ msgid "There are no tags yet" +#~ msgstr "Aucun tag n’a été créé pour le moment" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "Aucun signet n’a été créé" + +#~ msgid "Analytics HTML block" +#~ msgstr "Bloc HTML pour l'analytique" + +#~ msgid "" +#~ "HTML with JavaScript for web analytics" +#~ " systems like Google Analytics or " +#~ "Piwik. This will be added at the" +#~ " bottom of every page." +#~ msgstr "" +#~ "HTML avec du JavaScript pour les " +#~ "systèmes d'analyse Web comme Google " +#~ "Analytics ou Piwik. Ceci sera ajouté " +#~ "en bas de chaque page." + +#~ msgid "enabled" +#~ msgstr "activé" + +#~ msgid "%s Bookmarks" +#~ msgstr "Signets de %s" + +#~ msgid "Compare Bookmarks" +#~ msgstr "Comparer les marque-pages" + +#~ msgid "%s Branches" +#~ msgstr "Branches de %s" + +#~ msgid "Compare Branches" +#~ msgstr "Comparer les branches" + +#~ msgid "Editing file" +#~ msgstr "Édition du fichier" + +#~ msgid "Update" +#~ msgstr "Mettre à jour" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "" +#~ "Sauvegarder les modifications entrantes en " +#~ "tant que nouvelle requête de pull" + +#~ msgid "%s Tags" +#~ msgstr "Tags de %s" + +#~ msgid "Compare Tags" +#~ msgstr "Comparer les tags" + +#~ msgid "" +#~ "Changing status on a changeset " +#~ "associated with a closed pull request" +#~ " is not allowed" +#~ msgstr "" +#~ "La modification de l'état sur un " +#~ "ensemble de modifications associé à une" +#~ " demande de tirage fermé n'est pas" +#~ " autorisé" + +#~ msgid "You have successfully registered into Kallithea" +#~ msgstr "Vous vous êtes inscrits avec succès à Kallithea" + #~ msgid "This pull request can be updated with changes on %s:" #~ msgstr "" +#~ "Cette demande de pull peut être " +#~ "mise à jour avec les modifications " +#~ "de %s :" #~ msgid "Confirm to invalidate repository cache." #~ msgstr "Voulez-vous vraiment invalider le cache du dépôt ?" +#~ msgid "" +#~ "Changeset status: %s\n" +#~ "Click to open associated pull request %s" +#~ msgstr "" +#~ "Statut du changeset : %s\n" +#~ "Cliquer pour ouvrir la requête de pull %s associée" + +#~ msgid "Commenting on line {1}." +#~ msgstr "Commentaire sur la ligne {1}." + #~ msgid "Comments parsed using %s syntax with %s support." #~ msgstr "" +#~ "Les commentaires sont analysés avec la" +#~ " syntaxe %s, avec le support de " +#~ "la commande %s." #~ msgid "Use @username inside this text to notify another user" #~ msgstr "" +#~ "Utilisez @nomutilisateur dans ce texte " +#~ "pour envoyer une notification à un " +#~ "autre utilisateur" #~ msgid "Comment preview" #~ msgstr "Aperçu du commentaire" @@ -6479,5 +7480,18 @@ #~ msgid "Preview" #~ msgstr "Aperçu" +#~ msgid "Use @username inside this text to notify another user." +#~ msgstr "" +#~ "Utilisez @nomutilisateur dans ce texte " +#~ "pour envoyer une notification à un " +#~ "autre utilisateur." + #~ msgid "New file mode" #~ msgstr "Mode du nouveau fichier" + +#~ msgid "File is too big to display" +#~ msgstr "Ce fichier est trop gros pour être affiché" + +#~ msgid "Save as New Pull Request" +#~ msgstr "Sauvegarder en tant que nouvelle requête de pull" + diff -r a48802bf7134 -r 880e2f07651b kallithea/i18n/hu/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Thu Jul 27 03:02:37 2017 +0200 +++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po Thu Jul 27 14:26:14 2017 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2016-03-14 16:51+0100\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: 2015-04-11 00:59+0200\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian " @@ -19,445 +19,477 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 2.3-dev\n" -#: kallithea/controllers/changelog.py:85 -#: kallithea/controllers/pullrequests.py:240 kallithea/lib/base.py:515 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:198 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "" -#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 msgid "Ignore whitespace" msgstr "" -#: kallithea/controllers/changeset.py:168 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:744 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, python-format +msgid "Could not find other repository %s" +msgstr "" + +#: kallithea/controllers/compare.py:73 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "" +#: kallithea/controllers/error.py:70 +msgid "No response" +msgstr "" + #: kallithea/controllers/error.py:71 -msgid "No response" -msgstr "" - -#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "" - -#: kallithea/controllers/feed.py:56 +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 +#: kallithea/templates/changeset/changeset.html:195 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: kallithea/controllers/feed.py:84 +#, python-format +msgid "%s committed on %s" +msgstr "" + +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 #, python-format msgid "%s %s feed" msgstr "" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 -msgid "Changeset was too big and was cut off..." -msgstr "" - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "" - -#: kallithea/controllers/files.py:92 -msgid "Click here to add new file" +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 +#, python-format +msgid "Changes on %s repository" msgstr "" #: kallithea/controllers/files.py:93 +msgid "Click here to add new file" +msgstr "" + +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:195 +#: kallithea/controllers/files.py:191 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:307 kallithea/controllers/files.py:367 -#: kallithea/controllers/files.py:434 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:319 +#: kallithea/controllers/files.py:309 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:330 +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:352 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:356 kallithea/controllers/files.py:422 -#: kallithea/controllers/files.py:503 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:379 +#: kallithea/controllers/files.py:369 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:393 +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:409 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:418 kallithea/controllers/files.py:492 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:445 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:466 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:470 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "" +#: kallithea/controllers/files.py:517 +msgid "Downloads disabled" +msgstr "" + #: kallithea/controllers/files.py:528 -msgid "Downloads disabled" -msgstr "" - -#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "" -#: kallithea/controllers/files.py:543 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:773 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:94 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:479 -#: kallithea/templates/base/base.html:653 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "" -#: kallithea/controllers/home.py:151 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:157 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:306 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:150 +#: kallithea/controllers/login.py:148 +#, python-format msgid "You have successfully registered with %s" msgstr "" -#: kallithea/controllers/login.py:195 +#: kallithea/controllers/login.py:193 msgid "A password reset confirmation code has been sent" msgstr "" -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:242 msgid "Invalid password reset token" msgstr "" -#: kallithea/controllers/login.py:249 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:123 +#: kallithea/controllers/pullrequests.py:73 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:135 #, python-format msgid "%s (closed)" msgstr "" -#: kallithea/controllers/pullrequests.py:151 +#: kallithea/controllers/pullrequests.py:162 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:183 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:184 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:312 +#: kallithea/controllers/pullrequests.py:326 #, python-format msgid "Error creating pull request: %s" msgstr "" +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 +msgid "Error occurred while creating pull request" +msgstr "" + #: kallithea/controllers/pullrequests.py:358 -#: kallithea/controllers/pullrequests.py:505 -msgid "No description" -msgstr "" - -#: kallithea/controllers/pullrequests.py:365 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:368 -#: kallithea/controllers/pullrequests.py:455 -#: kallithea/controllers/pullrequests.py:512 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:371 -#: kallithea/controllers/pullrequests.py:458 -msgid "Error occurred while creating pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:403 -msgid "Missing changesets since the previous pull request:" +#: kallithea/controllers/pullrequests.py:381 +msgid "New pull request iteration created" msgstr "" #: kallithea/controllers/pullrequests.py:410 #, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:417 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:426 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:464 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:472 -msgid "Pull request update created" -msgstr "" - -#: kallithea/controllers/pullrequests.py:516 +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:414 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "" + +#: kallithea/controllers/pullrequests.py:439 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:531 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:491 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:599 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:617 -#, python-format -msgid "The following changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:621 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:629 +#: kallithea/controllers/pullrequests.py:552 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:556 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:635 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:571 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:573 +#, python-format +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:738 +#: kallithea/controllers/pullrequests.py:676 #, python-format msgid "Successfully deleted pull request %s" msgstr "" -#: kallithea/controllers/pullrequests.py:748 -msgid "Closing." -msgstr "" - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "" -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "" -#: kallithea/controllers/summary.py:181 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:184 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "" @@ -469,149 +501,153 @@ msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 msgid "Forever" msgstr "" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:290 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:200 msgid "Unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:201 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:324 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" msgstr "" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -619,610 +655,641 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:336 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:344 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1705 -msgid "Manual activation of external account" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1706 -msgid "Automatic activation of external account" -msgstr "" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:187 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:192 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:249 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "" +#: kallithea/controllers/admin/repo_groups.py:248 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:258 +#, python-format +msgid "This group contains %s repositories and cannot be deleted" +msgstr "" + #: kallithea/controllers/admin/repo_groups.py:265 #, python-format -msgid "Error occurred during update of repository group %s" -msgstr "" - -#: kallithea/controllers/admin/repo_groups.py:283 -#, python-format -msgid "This group contains %s repositories and cannot be deleted" -msgstr "" - -#: kallithea/controllers/admin/repo_groups.py:290 -#, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:296 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:301 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:404 -#: kallithea/controllers/admin/repo_groups.py:439 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:456 -#: kallithea/controllers/admin/repos.py:397 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:151 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:212 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:221 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:224 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:261 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:309 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:312 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:317 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:320 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:325 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:373 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:429 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:443 +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, python-format +msgid "An error occurred during creation of field: %r" +msgstr "" + +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:459 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:490 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:511 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "" -#: kallithea/controllers/admin/repos.py:513 +#: kallithea/controllers/admin/repos.py:473 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:480 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:536 -#: kallithea/controllers/admin/repos.py:563 +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 #, fuzzy msgid "Repository has been locked" msgstr "Ennek a tárolónak %s elágazása van" -#: kallithea/controllers/admin/repos.py:539 -#: kallithea/controllers/admin/repos.py:560 +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 #, fuzzy msgid "Repository has been unlocked" msgstr "Ennek a tárolónak %s elágazása van" -#: kallithea/controllers/admin/repos.py:542 -#: kallithea/controllers/admin/repos.py:567 +#: kallithea/controllers/admin/repos.py:502 +#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:533 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:585 +#: kallithea/controllers/admin/repos.py:537 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:603 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:636 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:151 -#: kallithea/controllers/admin/settings.py:248 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:187 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:244 +#: kallithea/controllers/admin/settings.py:189 +#, fuzzy, python-format +#| msgid "Private Repository" +msgid "Invalidated %s repositories" +msgstr "Tároló törlése" + +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:301 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:306 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:347 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:378 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:392 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:396 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:208 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:219 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:224 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:242 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:217 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:222 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:235 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:462 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:468 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:482 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:737 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:750 +#: kallithea/lib/auth.py:829 +msgid "You need to be a registered user to perform this action" +msgstr "" + +#: kallithea/lib/auth.py:857 +msgid "You need to be signed in to view this page" +msgstr "" + +#: kallithea/lib/base.py:449 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:768 +#: kallithea/lib/base.py:508 msgid "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/auth.py:813 -msgid "You need to be a registered user to perform this action" -msgstr "" - -#: kallithea/lib/auth.py:843 -msgid "You need to be signed in to view this page" -msgstr "" - -#: kallithea/lib/base.py:493 +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:623 -msgid "Changeset not found" -msgstr "" - -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/base.py:617 +#, python-format +msgid "Changeset for %s %s not found in %s" +msgstr "" + +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:613 +#, python-format +msgid "Changeset %s not found" +msgstr "" + +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1128 -#: kallithea/templates/compare/compare_diff.html:71 -#: kallithea/templates/pullrequests/pullrequest_show.html:337 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1469 +#: kallithea/lib/helpers.py:1230 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1230,1301 +1297,959 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:435 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:437 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:439 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:455 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:457 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:459 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:462 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:465 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1669 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2237 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2238 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1518 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1701 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1695 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1696 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1715 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1717 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 +#: kallithea/model/db.py:1718 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1719 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1720 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1722 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 +#: kallithea/model/db.py:1723 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1724 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1725 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1727 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1728 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1729 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1730 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1732 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1733 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1735 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1736 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1692 +#: kallithea/model/db.py:1738 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1693 +#: kallithea/model/db.py:1739 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1741 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1742 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1744 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1745 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1702 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1748 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1749 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2236 +#: kallithea/model/db.py:2276 #, fuzzy msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2239 +#: kallithea/model/db.py:2277 #, fuzzy msgid "Under review" msgstr "" -#: kallithea/model/forms.py:57 -msgid "Please enter a login" +#: kallithea/model/db.py:2278 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2279 +msgid "Approved" msgstr "" #: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 -msgid "Please enter a password" -msgstr "" - #: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:165 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "" +#: kallithea/model/notification.py:240 +#, python-format +msgid "%(user)s commented on changeset %(age)s" +msgstr "" + +#: kallithea/model/notification.py:241 +#, python-format +msgid "%(user)s sent message %(age)s" +msgstr "" + +#: kallithea/model/notification.py:242 +#, python-format +msgid "%(user)s mentioned you %(age)s" +msgstr "" + +#: kallithea/model/notification.py:243 +#, python-format +msgid "%(user)s registered in Kallithea %(age)s" +msgstr "" + +#: kallithea/model/notification.py:244 +#, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:245 +#, python-format +msgid "%(user)s commented on pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:252 +#, python-format +msgid "%(user)s commented on changeset at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:253 +#, python-format +msgid "%(user)s sent message at %(when)s" +msgstr "" + #: kallithea/model/notification.py:254 #, python-format -msgid "%(user)s commented on changeset %(age)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:255 #, python-format -msgid "%(user)s sent message %(age)s" +msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" #: kallithea/model/notification.py:256 #, python-format -msgid "%(user)s mentioned you %(age)s" +msgid "%(user)s opened new pull request at %(when)s" msgstr "" #: kallithea/model/notification.py:257 #, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:266 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:302 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:288 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" + +#: kallithea/model/notification.py:291 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:293 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:307 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:321 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:708 +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" " owners or remove those repository groups: %s" msgstr "" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:368 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:418 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:419 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:96 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:98 +#: kallithea/model/validators.py:75 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:100 +#: kallithea/model/validators.py:77 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" msgstr "" -#: kallithea/model/validators.py:127 +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:111 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + +#: kallithea/model/validators.py:131 +msgid "Invalid user group name" +msgstr "" + +#: kallithea/model/validators.py:132 +#, python-format +msgid "User group \"%(usergroup)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:134 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:154 -msgid "Invalid user group name" -msgstr "" - -#: kallithea/model/validators.py:155 -#, python-format -msgid "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:157 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:197 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:198 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:200 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:258 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:273 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:289 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:304 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:335 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "" -#: kallithea/model/validators.py:351 +#: kallithea/model/validators.py:326 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:353 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:354 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:356 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:470 +#: kallithea/model/validators.py:449 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:471 +#: kallithea/model/validators.py:450 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:496 +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:511 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:513 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:563 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:604 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:697 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:714 +#: kallithea/model/validators.py:692 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:712 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:771 +#: kallithea/model/validators.py:749 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -#: kallithea/model/validators.py:783 +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:784 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:831 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:847 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +#, fuzzy +#| msgid "Remote repository" +msgid "Repository Group" +msgstr "Tároló törlése" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:132 +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:244 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:414 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 #, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 msgid "Reset Your Password" msgstr "" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 msgid "Send Password Reset Email" msgstr "" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 msgid "New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 msgid "Confirm New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 msgid "Admin Journal" msgstr "" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2532,148 +2257,176 @@ msgstr[1] "%s bejegyzés" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 msgid "Repository Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "" +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 -msgid "Private repository" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 -msgid "" -"Private repositories are only visible to people explicitly added as " -"collaborators." +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 +msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 +msgid "Enable download menu on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 +msgid "Enable locking" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:61 #: kallithea/templates/admin/repos/repo_edit_settings.html:84 -msgid "Enable statistics" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 -msgid "Enable statistics window on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 -msgid "Enable downloads" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 -msgid "Enable download menu on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2682,316 +2435,469 @@ msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 msgid "Never" msgstr "" +#: kallithea/templates/admin/gists/edit.html:145 +msgid "Update Gist" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:146 -msgid "Update Gist" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:147 -#: kallithea/templates/changeset/changeset_file_comment.html:105 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, python-format msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, python-format msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:31 -#: kallithea/templates/changeset/changeset_file_comment.html:95 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:431 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 msgid "Owned Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 msgid "Watched Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 msgid "Show Permissions" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, fuzzy, python-format msgid "Confirm to reset this API key: %s" msgstr "A csoport törlésének megerősítése" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, fuzzy, python-format msgid "Confirm to remove this API key: %s" msgstr "A csoport törlésének megerősítése" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 msgid "Remove" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "" @@ -2999,279 +2905,359 @@ msgid "Change Your Account Password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 msgid "Repositories You Own" msgstr "" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 msgid "Repositories You are Watching" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 msgid "Mark All Read" msgstr "" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +msgid "Mark as read" +msgstr "" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 msgid "Show Notification" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:430 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 msgid "Default Permissions" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 msgid "Apply to all existing repositories" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 msgid "Permissions for the Default user on new repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 msgid "Repository group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 msgid "Apply to all existing repository groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 +msgid "Permissions for the Default user on new user groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 +msgid "Top level repository creation" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:55 -msgid "Permissions for the Default user on new user groups." +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 +msgid "Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 +msgid "" +"Note: This will also give all users API access to create repositories " +"everywhere. That might change in future versions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:60 -msgid "Top level repository creation" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, fuzzy, python-format msgid "Confirm to delete this IP address: %s" msgstr "A csoport törlésének megerősítése" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "" @@ -3280,31 +3266,42 @@ msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "" @@ -3328,12 +3325,14 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3344,16 +3343,32 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +msgid "Add repos" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3361,102 +3376,115 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "A csoport törlésének megerősítése" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" +#, fuzzy, python-format +#| msgid "This repository has %s fork" +#| msgid_plural "This repository has %s forks" +msgid "Repository group %s" +msgstr "Ennek a tárolónak %s elágazása van" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 msgid "Repository Groups Administration" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 #, fuzzy msgid "Clone remote repository" msgstr "Tároló törlése" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3485,91 +3513,112 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, python-format msgid "%s Repository Settings" msgstr "%s tároló beállítások" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 msgid "Parent" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 msgid "Public Journal Visibility" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 msgid "Add to Public Journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 msgid "Change Locking" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 +msgid "Unlock Repository" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 -msgid "Unlock Repository" +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 +#, python-format +msgid "Locked by %s on %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, python-format -msgid "Locked by %s on %s" +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 +msgid "Lock Repository" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3577,32 +3626,39 @@ "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 msgid "Delete this Repository" msgstr "Tároló törlése" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "Ennek a tárolónak %s elágazása van" msgstr[1] "Ennek a tárolónak %s elágazása van" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3613,103 +3669,113 @@ msgid "Invalidate Repository Cache" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "Tároló törlése" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "Remote repository" +msgid "Fork of repository" +msgstr "Tároló törlése" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "Tároló törlése" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 -msgid "Confirm to pull changes from remote repository." -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3719,34 +3785,34 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "Tároló törlése" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3759,312 +3825,371 @@ msgstr "" #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 msgid "Repositories Administration" msgstr "" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 msgid "Settings Administration" msgstr "" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems like Google" +" Analytics or Piwik, but also to perform " +"instance-specific customizations like adding a " +"project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 msgid "Save Settings" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 msgid "" "Check this option to remove all comments, pull requests and other records" " related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 +msgid "Install Git hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 +#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " "not seem to come from Kallithea. WARNING: This operation will destroy any" " custom git hooks you may have deployed by hand!" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/templates/admin/settings/settings_mapping.html:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 msgid "Mercurial extensions" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 +msgid "Enable hgsubversion extension" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:47 -msgid "Enable largefiles extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:51 -msgid "Enable hgsubversion extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 msgid "Location of repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting" " take effect." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4081,101 +4206,123 @@ "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." "\n" -" The following " +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user" +" username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +msgid "Repository page size" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 msgid "Show Members" msgstr "" @@ -4185,13 +4332,15 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4200,48 +4349,59 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 msgid "User Groups Administration" msgstr "" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "" @@ -4251,12 +4411,14 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "" @@ -4265,7 +4427,8 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4274,716 +4437,879 @@ msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 msgid "Users Administration" msgstr "" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:142 -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:147 +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:154 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:331 +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:155 +#: kallithea/tests/data/templates/base/base.html.py:399 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:157 +#: kallithea/tests/data/templates/base/base.html.py:405 msgid "Lock" msgstr "" +#: kallithea/templates/base/base.html:165 +#: kallithea/tests/data/templates/base/base.html.py:413 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 +msgid "Fork" +msgstr "" + #: kallithea/templates/base/base.html:170 -msgid "Follow" -msgstr "" - -#: kallithea/templates/base/base.html:171 -msgid "Unfollow" -msgstr "" - -#: kallithea/templates/base/base.html:174 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 +msgid "Create Pull Request" msgstr "" #: kallithea/templates/base/base.html:175 -#: kallithea/templates/pullrequests/pullrequest.html:88 -msgid "Create Pull Request" -msgstr "" - -#: kallithea/templates/base/base.html:180 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:485 +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:305 +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "" +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 +msgid "Gists" +msgstr "" + #: kallithea/templates/base/base.html:311 -#: kallithea/templates/base/base.html:312 -msgid "Public journal" -msgstr "" - -#: kallithea/templates/base/base.html:317 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:318 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:322 +#: kallithea/tests/data/templates/base/base.html.py:525 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:330 +#: kallithea/templates/base/base.html:319 +#: kallithea/tests/data/templates/base/base.html.py:540 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:353 -#: kallithea/templates/base/base.html:354 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:377 +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:384 +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 msgid "Login to Your Account" msgstr "" +#: kallithea/templates/base/base.html:385 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:389 +msgid "Don't have an account?" +msgstr "" + #: kallithea/templates/base/base.html:407 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:434 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:615 -msgid "Keyboard shortcuts" -msgstr "" - -#: kallithea/templates/base/base.html:624 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 msgid "Inherit defaults" msgstr "" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -msgid "Add Another Comment" -msgstr "Egy másik hozzászólás hozzáadása" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - #: kallithea/templates/base/root.html:25 -msgid "Group" -msgstr "" +#: kallithea/tests/data/templates/base/root.html.py:85 +msgid "Add Another Comment" +msgstr "Egy másik hozzászólás hozzáadása" #: kallithea/templates/base/root.html:26 -msgid "members" +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:27 -msgid "Loading ..." +#: kallithea/tests/data/templates/base/root.html.py:89 +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:28 -msgid "loading ..." +#: kallithea/tests/data/templates/base/root.html.py:91 +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/tests/data/templates/base/root.html.py:93 +msgid "members" msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" +#: kallithea/tests/data/templates/base/root.html.py:95 +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:31 -msgid "Open New Pull Request from {0}" +#: kallithea/tests/data/templates/base/root.html.py:97 +msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" +#: kallithea/tests/data/templates/base/root.html.py:99 +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets {0} → {1}" +#: kallithea/tests/data/templates/base/root.html.py:101 +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" +#: kallithea/tests/data/templates/base/root.html.py:103 +msgid "Open New Pull Request from {0}" msgstr "" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -#: kallithea/templates/changeset/diff_block.html:21 -msgid "Collapse Diff" +#: kallithea/tests/data/templates/base/root.html.py:105 +msgid "Open New Pull Request for {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:36 -msgid "Expand Diff" +#: kallithea/tests/data/templates/base/root.html.py:107 +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" +#: kallithea/tests/data/templates/base/root.html.py:109 +msgid "Selection Link" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 +msgid "Collapse Diff" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" +#: kallithea/tests/data/templates/base/root.html.py:113 +msgid "Expand Diff" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/base/root.html.py:115 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 msgid "Specify changeset" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." msgstr "" #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 msgid "Go to tip of repository" msgstr "" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 #, python-format msgid "" "Changeset status: %s by %s\n" "Click to open associated pull request %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/changelog/changelog_summary_data.html:24 +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 #, python-format msgid "Changeset status: %s by %s" msgstr "" +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 +msgid "Expand commit message" +msgstr "" + #: kallithea/templates/changelog/changelog.html:116 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:125 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:57 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:141 -#: kallithea/templates/changelog/changelog_summary_data.html:63 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#: kallithea/templates/compare/compare_cs.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:203 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:146 -#: kallithea/templates/changelog/changelog_summary_data.html:68 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:311 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:47 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:87 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:93 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 msgid "Push new repository" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:101 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:39 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:75 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 msgid "Merge" msgstr "" +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 +msgid "Grafted from:" +msgstr "" + #: kallithea/templates/changeset/changeset.html:123 -msgid "Grafted from:" +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 +msgid "Transplanted from:" msgstr "" #: kallithea/templates/changeset/changeset.html:129 -msgid "Transplanted from:" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:329 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:62 -#: kallithea/templates/pullrequests/pullrequest_show.html:331 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:231 -#: kallithea/templates/changeset/changeset.html:268 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 msgid "No revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 msgid "on pull request" msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 +msgid "No title" +msgstr "" + #: kallithea/templates/changeset/changeset_file_comment.html:22 -msgid "No title" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 #, fuzzy msgid "on this changeset" msgstr "%s módosításcsomag" -#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 msgid "Delete comment?" msgstr "Hozzászólás törlése?" -#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 #, fuzzy msgid "Status change" msgstr "%s módosításcsomag" -#: kallithea/templates/changeset/changeset_file_comment.html:59 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 msgid "Commenting on line." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:60 +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 msgid "" "Comments are in plain text. Use @username inside this text to notify " "another user." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 msgid "Set changeset status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:69 +#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:75 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 msgid "No change" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 msgid "Finish pull request" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 msgid "Close" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 msgid "Submitting ..." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:104 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:116 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:129 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "%d sorközi" msgstr[1] "%d sorközi" -#: kallithea/templates/changeset/changeset_file_comment.html:130 +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 #, python-format msgid "%d general" msgid_plural "%d general" @@ -4991,221 +5317,332 @@ msgstr[1] "" #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +msgid "Modified" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 msgid "Deleted" msgstr "" -#: kallithea/templates/changeset/diff_block.html:57 +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 msgid "Renamed" msgstr "" -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:48 +#, python-format +msgid "Unknown operation: %r" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:52 +msgid "No file after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:69 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:83 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "" #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:85 +#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:321 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:99 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:107 +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:108 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, python-format msgid "%s changesets" msgstr "%s módosításcsomag" -#: kallithea/templates/compare/compare_cs.html:109 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 msgid "behind" msgstr "" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "" #: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "" #: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy, python-format +#| msgid "%s changesets" +msgid "Changeset on" +msgstr "%s módosításcsomag" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +msgid "branch" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "%s módosításcsomag" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "Repository has been locked" +msgid "The pull request has been closed." +msgstr "Ennek a tárolónak %s elágazása van" + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 msgid "We have received a request to reset the password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:8 +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 msgid "" "This account is however managed outside this system and the password " "cannot be changed here." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:13 +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +msgid "Pull request from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +msgid "at" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" msgstr "" #: kallithea/templates/files/diff_2way.html:15 @@ -5224,82 +5661,104 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 +#: kallithea/tests/data/templates/files/files_add.html.py:241 msgid "New file type" msgstr "" -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 msgid "Commit Changes" msgstr "" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:62 -msgid "Last Revision" -msgstr "" - #: kallithea/templates/files/files_browser.html:63 -msgid "Last Modified" +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 +msgid "Size" msgstr "" #: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 msgid "Last Committer" msgstr "" @@ -5309,7 +5768,7 @@ msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5322,109 +5781,128 @@ msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "" -#: kallithea/templates/files/files_source.html:74 +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 msgid "File is too big to display." msgstr "" -#: kallithea/templates/files/files_source.html:76 +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 msgid "Show full annotation anyway." msgstr "" -#: kallithea/templates/files/files_source.html:78 +#: kallithea/templates/files/files_source.html:73 +#: kallithea/tests/data/templates/files/files_source.html.py:133 msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "" @@ -5433,70 +5911,80 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 -msgid "ATOM journal feed" -msgstr "" - #: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "" @@ -5510,34 +5998,45 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "" @@ -5572,7 +6071,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "" @@ -5590,117 +6091,150 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, python-format msgid "%s Pull Request %s" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, python-format msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 msgid "There are no reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 msgid "on" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:215 +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 msgid "" -"Pull requests do not change once created. Select a revision and save to " -"replace this pull request with a new one." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:224 +"Pull request iterations do not change content once created. Select a " +"revision and save to make a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +msgid "Cancel Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 msgid "Pull Request Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:249 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 msgid "Remove reviewer" msgstr "Átnéző eltávolítása" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:269 +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 msgid "Potential Reviewers" msgstr "Lehetséges átnézők" -#: kallithea/templates/pullrequests/pullrequest_show.html:272 +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:295 -msgid "Save Changes" +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 +msgid "Pull Request Content" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:296 -msgid "Save Updates as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:297 -msgid "Cancel Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:307 -msgid "Pull Request Content" +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +msgid "Common ancestor" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 @@ -5718,239 +6252,463 @@ msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 msgid "Search in All Repositories" msgstr "" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "" +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "" + #: kallithea/templates/summary/statistics.html:390 -msgid "commits" +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" msgstr "" #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" +#: kallithea/tests/data/templates/summary/statistics.html.py:153 +msgid "files removed" msgstr "" #: kallithea/templates/summary/statistics.html:393 -msgid "files removed" +#: kallithea/tests/data/templates/summary/statistics.html.py:155 +msgid "commit" +msgstr "" + +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 +msgid "file added" msgstr "" #: kallithea/templates/summary/statistics.html:395 -msgid "commit" +#: kallithea/tests/data/templates/summary/statistics.html.py:159 +msgid "file changed" msgstr "" #: kallithea/templates/summary/statistics.html:396 -msgid "file added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:397 -msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "" +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 +msgid "Show by ID" +msgstr "" + #: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/summary/summary.html.py:143 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "" +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 +msgid "Download" +msgstr "" + +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 +msgid "Downloads are disabled for this repository" +msgstr "" + #: kallithea/templates/summary/summary.html:108 -msgid "Download" +#: kallithea/tests/data/templates/summary/summary.html.py:190 +msgid "Download as zip" msgstr "" #: kallithea/templates/summary/summary.html:112 -msgid "There are no downloads yet" +#: kallithea/tests/data/templates/summary/summary.html.py:194 +msgid "Check this to download archive with subrepos" msgstr "" #: kallithea/templates/summary/summary.html:114 -msgid "Downloads are disabled for this repository" -msgstr "" - -#: kallithea/templates/summary/summary.html:120 -msgid "Download as zip" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 -msgid "Check this to download archive with subrepos" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 +#: kallithea/tests/data/templates/summary/summary.html.py:196 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 msgid "Latest Changes" msgstr "" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "" +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." +"\n" +" The following " +"variables are available:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "" +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +msgid "The comment was made with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" msgstr "" #~ msgid "increase diff context to %(num)s lines" @@ -6007,9 +6765,6 @@ #~ msgid "No Files" #~ msgstr "" -#~ msgid "" -#~ msgstr "" - #~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" #~ msgstr "" @@ -6358,8 +7113,235 @@ #~ msgid "Pull Requests from %s'" #~ msgstr "" +#~ msgid "Missing changesets since the previous pull request:" +#~ msgstr "" + +#~ msgid "New changesets on %s %s since the previous pull request:" +#~ msgstr "" + +#~ msgid "Ancestor didn't change - show diff since previous version:" +#~ msgstr "" + #~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request %s" -#~ msgstr "" - +#~ "This pull request is based on " +#~ "another %s revision and there is " +#~ "no simple diff." +#~ msgstr "" + +#~ msgid "No changes found on %s %s since previous version." +#~ msgstr "" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "" + +#~ msgid "Pull request update created" +#~ msgstr "" + +#~ msgid "The following changes are available on %s:" +#~ msgstr "" + +#~ msgid "No changesets found for updating this pull request." +#~ msgstr "" + +#~ msgid "Git pull requests don't support updates yet." +#~ msgstr "" + +#~ msgid "Closing." +#~ msgstr "" + +#~ msgid "An error occurred during creation of field" +#~ msgstr "" + +#~ msgid "Changeset not found" +#~ msgstr "" + +#~ msgid "Repository no access" +#~ msgstr "" + +#~ msgid "Repository read access" +#~ msgstr "" + +#~ msgid "Repository write access" +#~ msgstr "" + +#~ msgid "Repository admin access" +#~ msgstr "" + +#~ msgid "Repository Group no access" +#~ msgstr "" + +#~ msgid "Repository Group read access" +#~ msgstr "" + +#~ msgid "Repository Group write access" +#~ msgstr "" + +#~ msgid "Repository Group admin access" +#~ msgstr "" + +#~ msgid "Repository creation disabled" +#~ msgstr "" + +#~ msgid "Repository creation enabled" +#~ msgstr "" + +#~ msgid "Repository forking disabled" +#~ msgstr "" + +#~ msgid "Repository forking enabled" +#~ msgstr "" + +#~ msgid "Register disabled" +#~ msgstr "" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "" + +#~ msgid "Not Reviewed" +#~ msgstr "" + +#~ msgid "Rejected" +#~ msgstr "" + +#~ msgid "Under Review" +#~ msgstr "" + +#~ msgid "Repository group no access" +#~ msgstr "" + +#~ msgid "Repository group read access" +#~ msgstr "" + +#~ msgid "Repository group write access" +#~ msgstr "" + +#~ msgid "Repository group admin access" +#~ msgstr "" + +#~ msgid "User group no access" +#~ msgstr "" + +#~ msgid "User group read access" +#~ msgstr "" + +#~ msgid "User group write access" +#~ msgstr "" + +#~ msgid "User group admin access" +#~ msgstr "" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "" + +#~ msgid "User Group creation disabled" +#~ msgstr "" + +#~ msgid "User Group creation enabled" +#~ msgstr "" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "" + +#~ msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "repositories" +#~ msgstr "" + +#~ msgid "No repositories found." +#~ msgstr "" + +#~ msgid "There are no branches yet" +#~ msgstr "" + +#~ msgid "There are no tags yet" +#~ msgstr "" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "" + +#~ msgid "Analytics HTML block" +#~ msgstr "" + +#~ msgid "" +#~ "HTML with JavaScript for web analytics" +#~ " systems like Google Analytics or " +#~ "Piwik. This will be added at the" +#~ " bottom of every page." +#~ msgstr "" + +#~ msgid "" +#~ "Schema of clone URL construction eg. " +#~ "'{scheme}://{user}@{netloc}/{repo}'.\n" +#~ " The " +#~ "following variables are available:\n" +#~ " {scheme}" +#~ " 'http' or 'https' sent from running" +#~ " Kallithea server,\n" +#~ " {user}" +#~ " current user username,\n" +#~ " {netloc}" +#~ " network location/server host of running" +#~ " Kallithea server,\n" +#~ " {repo}" +#~ " full repository name,\n" +#~ " {repoid}" +#~ " ID of repository, can be used " +#~ "to contruct clone-by-id" +#~ msgstr "" + +#~ msgid "enabled" +#~ msgstr "" + +#~ msgid "disabled" +#~ msgstr "" + +#~ msgid "%s Bookmarks" +#~ msgstr "" + +#~ msgid "Compare Bookmarks" +#~ msgstr "" + +#~ msgid "%s Branches" +#~ msgstr "" + +#~ msgid "Compare Branches" +#~ msgstr "" + +#~ msgid "Editing file" +#~ msgstr "" + +#~ msgid "Update" +#~ msgstr "" + +#~ msgid "" +#~ "Pull requests do not change once " +#~ "created. Select a revision and save " +#~ "to replace this pull request with " +#~ "a new one." +#~ msgstr "" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "" + +#~ msgid "%s Tags" +#~ msgstr "" + +#~ msgid "Compare Tags" +#~ msgstr "" + diff -r a48802bf7134 -r 880e2f07651b kallithea/i18n/ja/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Thu Jul 27 03:02:37 2017 +0200 +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Thu Jul 27 14:26:14 2017 +0200 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2016-03-14 16:51+0100\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: 2016-01-07 01:53+0000\n" "Last-Translator: Takumi IINO \n" "Language-Team: Japanese " @@ -24,448 +24,490 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Weblate 2.5-dev\n" -#: kallithea/controllers/changelog.py:85 -#: kallithea/controllers/pullrequests.py:240 kallithea/lib/base.py:515 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "まだチェンジセットがありません" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "なし" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:198 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "(閉鎖済み)" -#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "空白を表示" -#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 msgid "Ignore whitespace" msgstr "空白を無視" -#: kallithea/controllers/changeset.py:168 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "diff コンテキストを %(num)s 行増やす" -#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:744 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "お探しのリビジョンはこのリポジトリにはありません" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "リビジョンを選択" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "リポジトリの最新のリビジョン(tip)に移動" + +#: kallithea/controllers/compare.py:73 +#, fuzzy +#| msgid "Cannot compare repositories without using common ancestor" +msgid "Cannot compare repositories of different types" +msgstr "共通の祖先を持たないのでリポジトリを比較できません" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "共通の祖先を持たないのでリポジトリを比較できません" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 msgid "No response" msgstr "応答がありません" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "不明なエラー" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "形式が間違っているため、サーバーはリクエストを処理できませんでした。" -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "リソースにアクセスする権限がありません" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "このページを閲覧する権限がありません" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "リソースが見つかりません" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "サーバーが不正な状態になったため、リクエストに答えることができませんでした。" -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "%s リポジトリでの変更" - -#: kallithea/controllers/feed.py:56 +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 +#: kallithea/templates/changeset/changeset.html:195 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 +msgid "Changeset was too big and was cut off..." +msgstr "チェンジセットが大きすぎるため、省略しました..." + +#: kallithea/controllers/feed.py:84 +#, python-format +msgid "%s committed on %s" +msgstr "%s が %s にコミット" + +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 #, python-format msgid "%s %s feed" msgstr "%s %s フィード" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 -msgid "Changeset was too big and was cut off..." -msgstr "チェンジセットが大きすぎるため、省略しました..." - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "%s が %s にコミット" - -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 +#, python-format +msgid "Changes on %s repository" +msgstr "%s リポジトリでの変更" + +#: kallithea/controllers/files.py:93 msgid "Click here to add new file" msgstr "新しいファイルを追加" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "まだファイルがありません。 %s" -#: kallithea/controllers/files.py:195 +#: kallithea/controllers/files.py:191 #, fuzzy, python-format msgid "%s at %s" msgstr "%s と %s の間" -#: kallithea/controllers/files.py:307 kallithea/controllers/files.py:367 -#: kallithea/controllers/files.py:434 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "このリポジトリは %s によって %s にロックされました" -#: kallithea/controllers/files.py:319 +#: kallithea/controllers/files.py:309 #, fuzzy msgid "You can only delete files with revision being a valid branch" msgstr "有効なブランチ上のリビジョンからしかファイルを削除できません" -#: kallithea/controllers/files.py:330 +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Kallithea経由で %s を削除" -#: kallithea/controllers/files.py:352 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "%s ファイルの削除に成功しました" -#: kallithea/controllers/files.py:356 kallithea/controllers/files.py:422 -#: kallithea/controllers/files.py:503 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "コミット中にエラーが発生しました" -#: kallithea/controllers/files.py:379 +#: kallithea/controllers/files.py:369 #, fuzzy msgid "You can only edit files with revision being a valid branch" msgstr "有効なブランチを示すリビジョンでのみファイルを編集できます " -#: kallithea/controllers/files.py:393 +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "Kallithea経由で %s を変更" -#: kallithea/controllers/files.py:409 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "変更点なし" -#: kallithea/controllers/files.py:418 kallithea/controllers/files.py:492 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "%s へのコミットが成功しました" -#: kallithea/controllers/files.py:445 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "Kallithea経由でファイルを追加" -#: kallithea/controllers/files.py:466 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "内容がありません" -#: kallithea/controllers/files.py:470 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "ファイル名がありません" -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "場所には相対パスかつ .. を含まないパスを入力してください" +#: kallithea/controllers/files.py:517 +msgid "Downloads disabled" +msgstr "ダウンロードは無効化されています" + #: kallithea/controllers/files.py:528 -msgid "Downloads disabled" -msgstr "ダウンロードは無効化されています" - -#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "%s は未知のリビジョンです" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "空のリポジトリ" -#: kallithea/controllers/files.py:543 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "未知のアーカイブ種別です" -#: kallithea/controllers/files.py:773 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "チェンジセット" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "ブランチ" -#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "タグ" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "リポジトリ %s のフォーク中にエラーが発生しました" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "グループ" -#: kallithea/controllers/home.py:94 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:479 -#: kallithea/templates/base/base.html:653 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "リポジトリ" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "ブランチ" -#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "閉鎖済みブランチ" -#: kallithea/controllers/home.py:151 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "タグ" -#: kallithea/controllers/home.py:157 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "ブックマーク" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "公開ジャーナル" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:306 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "ジャーナル" -#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 msgid "Bad captcha" msgstr "キャプチャが一致しません" -#: kallithea/controllers/login.py:150 +#: kallithea/controllers/login.py:148 +#, python-format msgid "You have successfully registered with %s" msgstr "%sへの登録を受け付けました" -#: kallithea/controllers/login.py:195 +#: kallithea/controllers/login.py:193 msgid "A password reset confirmation code has been sent" msgstr "パスワードリセットの確認コードが送信されました" -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:242 msgid "Invalid password reset token" msgstr "無効なパスワードリセットトークン" -#: kallithea/controllers/login.py:249 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "パスワードを更新しました" -#: kallithea/controllers/pullrequests.py:123 -#, python-format -msgid "%s (closed)" -msgstr "%s (閉鎖済み)" - -#: kallithea/controllers/pullrequests.py:151 -#: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 -msgid "Changeset" -msgstr "チェンジセット" - -#: kallithea/controllers/pullrequests.py:172 -msgid "Special" -msgstr "スペシャル" - -#: kallithea/controllers/pullrequests.py:173 -msgid "Peer branches" -msgstr "相手のブランチ" - -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 -msgid "Bookmarks" -msgstr "ブックマーク" - -#: kallithea/controllers/pullrequests.py:312 -#, python-format -msgid "Error creating pull request: %s" -msgstr "プルリクエスト作成中にエラーが発生しました: %s" - -#: kallithea/controllers/pullrequests.py:358 -#: kallithea/controllers/pullrequests.py:505 -msgid "No description" -msgstr "説明がありません" - -#: kallithea/controllers/pullrequests.py:365 -msgid "Successfully opened new pull request" -msgstr "新しいプルリクエストの作成に成功しました" - -#: kallithea/controllers/pullrequests.py:368 -#: kallithea/controllers/pullrequests.py:455 -#: kallithea/controllers/pullrequests.py:512 +#: kallithea/controllers/pullrequests.py:73 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:371 -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:135 +#, python-format +msgid "%s (closed)" +msgstr "%s (閉鎖済み)" + +#: kallithea/controllers/pullrequests.py:162 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 +msgid "Changeset" +msgstr "チェンジセット" + +#: kallithea/controllers/pullrequests.py:183 +msgid "Special" +msgstr "スペシャル" + +#: kallithea/controllers/pullrequests.py:184 +msgid "Peer branches" +msgstr "相手のブランチ" + +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 +msgid "Bookmarks" +msgstr "ブックマーク" + +#: kallithea/controllers/pullrequests.py:326 +#, python-format +msgid "Error creating pull request: %s" +msgstr "プルリクエスト作成中にエラーが発生しました: %s" + +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 msgid "Error occurred while creating pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: kallithea/controllers/pullrequests.py:403 -msgid "Missing changesets since the previous pull request:" -msgstr "" +#: kallithea/controllers/pullrequests.py:358 +msgid "Successfully opened new pull request" +msgstr "新しいプルリクエストの作成に成功しました" + +#: kallithea/controllers/pullrequests.py:381 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" +msgstr "プルリクエストレビュアー" #: kallithea/controllers/pullrequests.py:410 #, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:417 -msgid "Ancestor didn't change - show diff since previous version:" +msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." +#: kallithea/controllers/pullrequests.py:414 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:426 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:464 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "%s で置き換えられたのでクローズします。" - -#: kallithea/controllers/pullrequests.py:472 -#, fuzzy -msgid "Pull request update created" -msgstr "プルリクエストレビュアー" - -#: kallithea/controllers/pullrequests.py:516 +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "説明がありません" + +#: kallithea/controllers/pullrequests.py:439 msgid "Pull request updated" msgstr "プルリクエストを更新しました" -#: kallithea/controllers/pullrequests.py:531 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "プルリクエストの削除に成功しました" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:491 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "プルリクエストを更新するためのチェンジセットが見つかりません。" + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:599 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "このプルリクエストはすでにクローズされていて、更新することはできません。" -#: kallithea/controllers/pullrequests.py:617 -#, python-format -msgid "The following changes are available on %s:" +#: kallithea/controllers/pullrequests.py:552 +#, python-format +msgid "The following additional changes are available on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:621 -msgid "No changesets found for updating this pull request." +#: kallithea/controllers/pullrequests.py:556 +#, fuzzy +#| msgid "No changesets found for updating this pull request." +msgid "No additional changesets found for iterating on this pull request." msgstr "プルリクエストを更新するためのチェンジセットが見つかりません。" -#: kallithea/controllers/pullrequests.py:629 +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "ノート: ブランチ%sには別のヘッド%sがあります。" -#: kallithea/controllers/pullrequests.py:635 -msgid "Git pull requests don't support updates yet." +#: kallithea/controllers/pullrequests.py:571 +#, fuzzy +#| msgid "Git pull requests don't support updates yet." +msgid "Git pull requests don't support iterating yet." msgstr "Gitのプルリクエストはまだ更新をサポートしていません。" -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:573 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "プルリクエストを更新するためのチェンジセットが見つかりません。" + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 msgid "No permission to change pull request status" msgstr "プルリクエストステータスを変更する権限がありません" -#: kallithea/controllers/pullrequests.py:738 +#: kallithea/controllers/pullrequests.py:676 #, fuzzy, python-format msgid "Successfully deleted pull request %s" msgstr "プルリクエストの削除に成功しました" -#: kallithea/controllers/pullrequests.py:748 -msgid "Closing." -msgstr "クローズ。" - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "無効な検索クエリーです。\\\"で囲んで下さい。" -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "検索するためのインデックスがありません。whooshでインデックスを作成して下さい" -#: kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "検索を実行する際にエラーが発生しました。" -#: kallithea/controllers/summary.py:181 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 msgid "No data ready yet" msgstr "まだデータの準備ができていません" -#: kallithea/controllers/summary.py:184 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "このリポジトリの統計は無効化されています" @@ -477,149 +519,153 @@ msgid "error occurred during update of auth settings" msgstr "認証設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "デフォルト設定の更新に成功しました" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "デフォルト設定の更新中にエラーが発生しました" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 msgid "Forever" msgstr "永久" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "5 minutes" msgstr "5 分" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 hour" msgstr "1 時間" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 msgid "1 day" msgstr "1 日" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "1 ヶ月" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:290 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "有効期間" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "gist の作成中にエラーが発生しました" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "gist %s を削除しました" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:200 msgid "Unmodified" msgstr "変更しない" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "Gist の内容を更新しました" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "Gist データを更新しました" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "Gist %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "このユーザーはアプリケーション全体で非常に重要なので編集できません" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "アカウントの更新に成功しました" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:201 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "ユーザー %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "パスワードの更新中にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "ユーザーにメールアドレス %s を追加しました" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "メールの保存時にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "ユーザーからメールアドレスを削除しました" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "APIキーの作成に成功しました" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "APIキーのリセットに成功しました" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:324 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "APIキーの削除に成功しました" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "読込" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" -msgstr "書込" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" +msgstr "読込" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "書込" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -627,608 +673,642 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:336 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:344 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "管理" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "無効" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "手動でアカウントをアクティベートする" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "自動でアカウントをアクティベートする" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1705 -msgid "Manual activation of external account" -msgstr "外部アカウントを手動でアクティベートする" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1706 -msgid "Automatic activation of external account" -msgstr "外部アカウントを自動でアクティベートする" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "無効" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "手動でアカウントをアクティベートする" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "自動でアカウントをアクティベートする" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "外部アカウントを手動でアクティベートする" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "外部アカウントを自動でアクティベートする" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "有効" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "全般の権限の更新に成功しました" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "権限の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:187 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "リポジトリグループ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:192 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "リポジトリグループ %s を作成しました" -#: kallithea/controllers/admin/repo_groups.py:249 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "リポジトリグループ %s を更新しました" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:248 #, python-format msgid "Error occurred during update of repository group %s" msgstr "リポジトリグループ %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:283 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "このグループは %s 個のリポジトリを含んでいるため削除できません" -#: kallithea/controllers/admin/repo_groups.py:290 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "このグループは %s 個のサブグループを含んでいるため削除できません" -#: kallithea/controllers/admin/repo_groups.py:296 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "リポジトリグループ %s を削除しました" -#: kallithea/controllers/admin/repo_groups.py:301 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "リポジトリグループ %s の削除中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:404 -#: kallithea/controllers/admin/repo_groups.py:439 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "自分自身の管理者としての権限を取り消すことはできません" -#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "リポジトリグループ権限を更新しました" -#: kallithea/controllers/admin/repo_groups.py:456 -#: kallithea/controllers/admin/repos.py:397 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "権限の取消中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:151 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "リポジトリ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:212 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "リポジトリ %s を %s から作成しました" -#: kallithea/controllers/admin/repos.py:221 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "リポジトリ %s を %s としてフォークしました" -#: kallithea/controllers/admin/repos.py:224 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "リポジトリ %s を作成しました" -#: kallithea/controllers/admin/repos.py:261 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "リポジトリ %s の更新に成功しました" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "リポジトリ %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:309 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "%s 個のフォークを切り離しました" -#: kallithea/controllers/admin/repos.py:312 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "%s 個のフォークを削除しました" -#: kallithea/controllers/admin/repos.py:317 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "リポジトリ %s を削除しました" -#: kallithea/controllers/admin/repos.py:320 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "フォークしたリポジトリが存在するため、 リポジトリ %s は削除できません" -#: kallithea/controllers/admin/repos.py:325 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "%s の削除中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:373 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "リポジトリ権限を更新しました" -#: kallithea/controllers/admin/repos.py:429 -msgid "An error occurred during creation of field" +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, fuzzy, python-format +#| msgid "An error occurred during creation of field" +msgid "An error occurred during creation of field: %r" msgstr "フィールドの作成中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:443 +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "フィールドの削除中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:459 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "-- フォークではありません --" -#: kallithea/controllers/admin/repos.py:490 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "公開ジャーナルでのリポジトリの可視性を更新しました" -#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:511 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "ありません" -#: kallithea/controllers/admin/repos.py:513 +#: kallithea/controllers/admin/repos.py:473 #, python-format msgid "Marked repository %s as fork of %s" msgstr "%s リポジトリを %s のフォークとする" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:480 msgid "An error occurred during this operation" msgstr "操作中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:536 -#: kallithea/controllers/admin/repos.py:563 +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 msgid "Repository has been locked" msgstr "リポジトリがロックされました" -#: kallithea/controllers/admin/repos.py:539 -#: kallithea/controllers/admin/repos.py:560 +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 msgid "Repository has been unlocked" msgstr "リポジトリのロックが解除されました" -#: kallithea/controllers/admin/repos.py:542 -#: kallithea/controllers/admin/repos.py:567 +#: kallithea/controllers/admin/repos.py:502 +#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during unlocking" msgstr "アンロック中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:533 msgid "Cache invalidation successful" msgstr "キャッシュの無効化に成功しました" -#: kallithea/controllers/admin/repos.py:585 +#: kallithea/controllers/admin/repos.py:537 msgid "An error occurred during cache invalidation" msgstr "キャッシュの無効化中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "リモートから取得" -#: kallithea/controllers/admin/repos.py:603 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "リモートから取得中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:636 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "リポジトリステートの削除中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "VCS設定を更新しました" -#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "\"hgsubversion\"ライブラリが見つからないため、hgsubversionサポートを有効に出来ません" -#: kallithea/controllers/admin/settings.py:151 -#: kallithea/controllers/admin/settings.py:248 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "アプリケーション設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:187 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s。" -#: kallithea/controllers/admin/settings.py:244 +#: kallithea/controllers/admin/settings.py:189 +#, fuzzy, python-format +#| msgid "Invalidate cache for all repositories" +msgid "Invalidated %s repositories" +msgstr "すべてのリポジトリのキャッシュを無効化する" + +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "アプリケーション設定を更新しました" -#: kallithea/controllers/admin/settings.py:301 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "表示設定を更新しました" -#: kallithea/controllers/admin/settings.py:306 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "表示設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "メールアドレスを入力してください" -#: kallithea/controllers/admin/settings.py:347 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "メール送信タスクを作成しました" -#: kallithea/controllers/admin/settings.py:378 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "新しいフックを追加しました" -#: kallithea/controllers/admin/settings.py:392 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "フックを更新しました" -#: kallithea/controllers/admin/settings.py:396 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "フックの作成中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "Whooshの再インデックスタスクを予定に入れました" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "ユーザーグループ %s を作成しました" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "ユーザーグループ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "ユーザーグループ %s を更新しました" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:208 #, python-format msgid "Error occurred during update of user group %s" msgstr "ユーザーグループ %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:219 msgid "Successfully deleted user group" msgstr "ユーザーグループの削除に成功しました" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:224 msgid "An error occurred during deletion of user group" msgstr "ユーザーグループの削除中にエラーが発生しました" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "対象に同じ物を選ぶことはできません" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "ユーザーグループ権限を更新しました" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "権限を更新しました" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "権限の保存時にエラーが発生しました" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "ユーザー %s を作成しました" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "ユーザー %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "ユーザーの更新に成功しました" -#: kallithea/controllers/admin/users.py:217 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "ユーザーの削除に成功しました" -#: kallithea/controllers/admin/users.py:222 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "ユーザーの削除中にエラーが発生しました" -#: kallithea/controllers/admin/users.py:235 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "デフォルト ユーザーを編集できません" -#: kallithea/controllers/admin/users.py:462 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "ユーザーホワイトリストにIP %s を追加しました" -#: kallithea/controllers/admin/users.py:468 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "IPアドレスの保存中にエラーが発生しました" -#: kallithea/controllers/admin/users.py:482 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "ユーザーホワイトリストからIPアドレスを削除しました" -#: kallithea/lib/auth.py:737 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "IPアドレス %s は許可されません" -#: kallithea/lib/auth.py:750 +#: kallithea/lib/auth.py:829 +msgid "You need to be a registered user to perform this action" +msgstr "このアクションを実行するためには登録済みのユーザーである必要があります" + +#: kallithea/lib/auth.py:857 +msgid "You need to be signed in to view this page" +msgstr "このページを閲覧するためにはサインインが必要です" + +#: kallithea/lib/base.py:449 msgid "Invalid API key" msgstr "APIキーが無効です" -#: kallithea/lib/auth.py:768 +#: kallithea/lib/base.py:508 msgid "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/auth.py:813 -msgid "You need to be a registered user to perform this action" -msgstr "このアクションを実行するためには登録済みのユーザーである必要があります" - -#: kallithea/lib/auth.py:843 -msgid "You need to be signed in to view this page" -msgstr "このページを閲覧するためにはサインインが必要です" - -#: kallithea/lib/base.py:493 +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "ファイルシステム内にリポジトリが見つかりません" -#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:623 -msgid "Changeset not found" +#: kallithea/lib/base.py:617 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset for %s %s not found in %s" msgstr "リビジョンが見つかりません" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "バイナリファイル" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "チェンジセットが大きすぎるため省略しました。差分を表示する場合は差分メニューを使用してください" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "検出された変更はありません" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "削除されたブランチ: %s" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "作成したタグ: %s" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:613 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset %s not found" +msgstr "リビジョンが見つかりません" + +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "%s から %s までのすべてのチェンジセットを表示" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 msgid "Compare view" msgstr "比較ビュー" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "と" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "%s 以上" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "リビジョン" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, python-format msgid "Fork name %s" msgstr "フォーク名 %s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, python-format msgid "Pull request %s" msgstr "プルリクエスト #%s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "リポジトリを[削除]" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 msgid "[created] repository" msgstr "リポジトリを[作成]" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "フォークしてリポジトリを[作成]" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "リポジトリを[フォーク]" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "リポジトリを[更新]" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "リポジトリからアーカイブを[ダウンロード]" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "リポジトリを[削除]" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "ユーザーを[作成]" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "ユーザーを[更新]" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "ユーザーグループを[作成]" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "ユーザーグループを[更新]" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "リポジトリのリビジョンに[コメント]" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "プルリクエストに[コメント]" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "プルリクエストを[クローズ]" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "[プッシュ]" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "リポジトリに[Kallithea経由でコミット]" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "リポジトリに[リモートからプル]" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "[プル]" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "リポジトリの[フォローを開始]" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "リポジトリの[フォローを停止]" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr " と %s 以上" -#: kallithea/lib/helpers.py:1128 -#: kallithea/templates/compare/compare_diff.html:71 -#: kallithea/templates/pullrequests/pullrequest_show.html:337 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "ファイルはありません" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "新しいファイル" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "変更" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "削除" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "リネーム" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1469 +#: kallithea/lib/helpers.py:1230 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1238,735 +1318,390 @@ "%s " "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを再起動してください" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d 年" -#: kallithea/lib/utils2.py:435 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d ヶ月" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d 日" -#: kallithea/lib/utils2.py:437 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 時間" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分" -#: kallithea/lib/utils2.py:439 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" -#: kallithea/lib/utils2.py:455 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "%s 以内" -#: kallithea/lib/utils2.py:457 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "%s 前" -#: kallithea/lib/utils2.py:459 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "%s と %s の間" -#: kallithea/lib/utils2.py:462 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "%s と %s 前" -#: kallithea/lib/utils2.py:465 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "たったいま" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "リポジトリへのアクセス権限無し" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "リポジトリに読込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "リポジトリに書込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "リポジトリに管理権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "リポジトリグループへのアクセス権限なし" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "リポジトリグループに読込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "リポジトリグループに書込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "リポジトリグループに管理権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1669 -msgid "Kallithea Administrator" -msgstr "Kallithea 管理者" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "リポジトリの作成を有効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "リポジトリの作成を有効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "リポジトリのフォークを無効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "リポジトリのフォークを有効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "新規登録を無効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "Kallitheaに登録した新しいユーザーを手動でアクティベートする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "Kallitheaに登録した新しいユーザーを自動でアクティベートする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "未レビュー" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2237 -msgid "Approved" -msgstr "承認" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2238 -msgid "Rejected" -msgstr "却下" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "レビュー中" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1518 -msgid "top level" -msgstr "top level" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "リポジトリグループへのアクセス権限なし" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "リポジトリグループに読込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "リポジトリグループに書込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "リポジトリグループに管理権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "ユーザーグループへのアクセス権限なし" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "ユーザーグループに読込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "ユーザーグループに書込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "ユーザーグループに管理権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "リポジトリグループの作成を無効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "リポジトリグループの作成を有効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "ユーザーグループの作成を無効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "ユーザーグループの作成を有効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1701 -msgid "Registration disabled" -msgstr "新規登録を無効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1695 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1696 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "%s 行目" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "[Mention]" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "top level" + +#: kallithea/model/db.py:1715 +msgid "Kallithea Administrator" +msgstr "Kallithea 管理者" + +#: kallithea/model/db.py:1717 msgid "Default user has no access to new repositories" msgstr "デフォルトユーザーは新しいリポジトリにアクセスできません" -#: kallithea/model/db.py:1672 +#: kallithea/model/db.py:1718 msgid "Default user has read access to new repositories" msgstr "デフォルトユーザーは新しいリポジトリに読み取りアクセスする権限があります" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1719 msgid "Default user has write access to new repositories" msgstr "デフォルトユーザーは新しいリポジトリに書き込みアクセスする権限があります" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1720 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1722 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 +#: kallithea/model/db.py:1723 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1724 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1725 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1727 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1728 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1729 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1730 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1732 msgid "Only admins can create repository groups" msgstr "管理者のみがリポジトリのグループを作成できます" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1733 msgid "Non-admins can create repository groups" msgstr "非管理者がリポジトリのグループを作成できます" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1735 msgid "Only admins can create user groups" msgstr "管理者だけがユーザー グループを作成することができます" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1736 msgid "Non-admins can create user groups" msgstr "非管理者ユーザーがグループを作成することができます" -#: kallithea/model/db.py:1692 +#: kallithea/model/db.py:1738 msgid "Only admins can create top level repositories" msgstr "管理者だけがトップレベルにリポジトリを作成することができます" -#: kallithea/model/db.py:1693 +#: kallithea/model/db.py:1739 msgid "Non-admins can create top level repositories" msgstr "非管理者がトップレベルにリポジトリを作成することができます" -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1741 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" + +#: kallithea/model/db.py:1742 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" + +#: kallithea/model/db.py:1744 msgid "Only admins can fork repositories" msgstr "管理者のみがリポジトリをフォークすることができます" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1745 #, fuzzy msgid "Non-admins can fork repositories" msgstr "非管理者がリポジトリをフォークすることができます" -#: kallithea/model/db.py:1702 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "新規登録を無効にする" + +#: kallithea/model/db.py:1748 msgid "User registration with manual account activation" msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1749 msgid "User registration with automatic account activation" msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" -#: kallithea/model/db.py:2236 +#: kallithea/model/db.py:2276 msgid "Not reviewed" msgstr "未レビュー" -#: kallithea/model/db.py:2239 +#: kallithea/model/db.py:2277 msgid "Under review" msgstr "レビュー中" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2278 +#, fuzzy +#| msgid "Approved" +msgid "Not approved" +msgstr "承認" + +#: kallithea/model/db.py:2279 +msgid "Approved" +msgstr "承認" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "ログイン名を入力してください" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "%(min)i 文字以上必要です" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "パスワードを入力してください" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "%(min)i 文字以上必要です" -#: kallithea/model/forms.py:165 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "数字だけの名前は使えません" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:240 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s がチェンジセットにコメント %(age)s" -#: kallithea/model/notification.py:255 +#: kallithea/model/notification.py:241 #, python-format msgid "%(user)s sent message %(age)s" msgstr "%(user)s がメッセージを送信 %(age)s" -#: kallithea/model/notification.py:256 +#: kallithea/model/notification.py:242 #, python-format msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s がにあなたにメンション %(age)s" -#: kallithea/model/notification.py:257 +#: kallithea/model/notification.py:243 #, python-format msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s がKallitheaに登録 %(age)s" -#: kallithea/model/notification.py:258 +#: kallithea/model/notification.py:244 #, python-format msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s が新しいプルリクエストを作成 %(age)s" -#: kallithea/model/notification.py:259 +#: kallithea/model/notification.py:245 #, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s がプルリクエストにコメント %(age)s" -#: kallithea/model/notification.py:266 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s がチェンジセットにコメント %(when)s" -#: kallithea/model/notification.py:267 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s がメッセージを送信 %(when)s" -#: kallithea/model/notification.py:268 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s がにあなたにメンション %(when)s" -#: kallithea/model/notification.py:269 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s がKallitheaに登録 %(when)s" -#: kallithea/model/notification.py:270 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s が新しいプルリクエストを作成 %(when)s" -#: kallithea/model/notification.py:271 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s がプルリクエストにコメント %(when)s" -#: kallithea/model/notification.py:302 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:288 +#, fuzzy, python-format +#| msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "プルリクエストに[コメント]" + +#: kallithea/model/notification.py:291 #, python-format msgid "New user %(new_username)s registered" msgstr "新しいユーザー %(new_username)s が登録されました" +#: kallithea/model/notification.py:293 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:307 -#, fuzzy, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "%(user)s がプリリクエスト #%(pr_id)s: %(pr_title)s のレビューを求めています" - -#: kallithea/model/notification.py:308 -#, fuzzy, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "プルリクエストに[コメント]" - -#: kallithea/model/notification.py:321 msgid "Closing" msgstr "クローズ" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "%(user)s がプリリクエスト #%(pr_nice_id)s: %(pr_title)s のレビューを求めています" -#: kallithea/model/scm.py:708 +#: kallithea/model/pull_request.py:211 +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Cannot create empty pull request" +msgstr "プルリクエスト作成中にエラーが発生しました: %s" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +#, fuzzy +#| msgid "Confirm to delete this pull request" +msgid "You are not authorized to create the pull request" +msgstr "このプルリクエストを削除してもよろしいですか？" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "最新のtip" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "新規ユーザー登録" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 #, fuzzy msgid "You can't remove this user since it is crucial for the entire application" msgstr "このユーザーを削除できません。このユーザーはアプリケーションにとって必要不可欠です。" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください： %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" @@ -1975,7 +1710,7 @@ "ユーザー \"%s\" はまだ %s " "個のリポジトリグループの所有者のため削除することはできません。リポジトリグループの所有者を変更するか削除してください： %s" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -1984,701 +1719,739 @@ "ユーザー \"%s\" はまだ %s " "個のユーザーグループの所有者のため削除することはできません。ユーザーグループの所有者を変更するか削除してください。 %s" -#: kallithea/model/user.py:368 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "パスワードリセットのリンク" -#: kallithea/model/user.py:418 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "パスワードの再設定通知" -#: kallithea/model/user.py:419 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "空のリストにはできません" -#: kallithea/model/validators.py:96 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "ユーザー名 \"%(username)s\" はすでに使われています" -#: kallithea/model/validators.py:98 +#: kallithea/model/validators.py:75 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "ユーザー名 %(username)s は使用できません" -#: kallithea/model/validators.py:100 +#: kallithea/model/validators.py:77 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットまたはアンダースコア(_)から始まる必要があります" -#: kallithea/model/validators.py:127 +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "入力が正しくありません" -#: kallithea/model/validators.py:134 +#: kallithea/model/validators.py:111 #, python-format msgid "Username %(username)s is not valid" msgstr "ユーザー名 %(username)s は不正です" -#: kallithea/model/validators.py:154 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "不正なユーザーグループ名です" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:132 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "ユーザーグループ \"%(usergroup)s\" はすでに存在します" -#: kallithea/model/validators.py:157 +#: kallithea/model/validators.py:134 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" -#: kallithea/model/validators.py:197 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "このグループは親にできません" -#: kallithea/model/validators.py:198 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "グループ \"%(group_name)s\" はすでに存在します" -#: kallithea/model/validators.py:200 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "グループ名 \"%(group_name)s\" を持つリポジトリはすでに存在します" -#: kallithea/model/validators.py:258 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "パスワードに利用出来ない文字列(non-ascii)です" -#: kallithea/model/validators.py:273 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "古いpasswordが間違っています" -#: kallithea/model/validators.py:289 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "パスワードが一致しません" -#: kallithea/model/validators.py:304 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "ユーザー名とパスワードの組み合わせが無効です" -#: kallithea/model/validators.py:335 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "トークンが一致しません" -#: kallithea/model/validators.py:351 +#: kallithea/model/validators.py:326 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "リポジトリ名 %(repo)s は許可されていません" -#: kallithea/model/validators.py:353 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "リポジトリ %(repo)s はすでに存在します" -#: kallithea/model/validators.py:354 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "リポジトリ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します" -#: kallithea/model/validators.py:356 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "リポジトリグループ名 \"%(repo)s\" はすでに存在します" -#: kallithea/model/validators.py:470 +#: kallithea/model/validators.py:449 msgid "Invalid repository URL" msgstr "無効なリポジトリのURL" -#: kallithea/model/validators.py:471 +#: kallithea/model/validators.py:450 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:496 +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "フォークは親と同じ種別の必要があります" -#: kallithea/model/validators.py:511 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "このグループにリポジトリを作成する権限がありません" -#: kallithea/model/validators.py:513 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "ルートにリポジトリを作成する権限がありません" -#: kallithea/model/validators.py:563 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "この場所にグループを作成する権限がありません" -#: kallithea/model/validators.py:604 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "ユーザー名かユーザーグループが不正です" -#: kallithea/model/validators.py:697 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "不正なパスです" -#: kallithea/model/validators.py:714 +#: kallithea/model/validators.py:692 msgid "This email address is already in use" msgstr "このメールアドレスはすでに取得されています" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:712 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "メールアドレス \"%(email)s\" がみつかりません" -#: kallithea/model/validators.py:771 +#: kallithea/model/validators.py:749 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "LDAPのこのCNに対するログイン属性は必須です。 - これは \"ユーザー名\" と同じです" -#: kallithea/model/validators.py:783 +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "有効なIPv4かIPv6のアドレスを入力してください" -#: kallithea/model/validators.py:784 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "ネットワークサイズ (bits) は0-32の範囲にする必要があります ( %(bits)r は不正です)" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "キー名にはアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)、数字が使えます" -#: kallithea/model/validators.py:831 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "ファイル名はディレクトリ内にすることはできません" -#: kallithea/model/validators.py:847 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "%(loaded)s プラグインと %(next_to_load)s プラグインで同じ名前が使われています" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "ダッシュボード" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "クイックフィルタ..." - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "リポジトリ" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "リポジトリを追加" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "リポジトリグループを追加" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "管理者権限をもっているため編集できます" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "リポジトリグループを編集" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "グループ名" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +#, fuzzy +#| msgid "Repository group" +msgid "Repository Group" +msgstr "リポジトリグループ" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "説明" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "名前" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "リポジトリ" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "最後の変更点" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" msgstr "Tip" -#: kallithea/templates/index_base.html:132 +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:244 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "所有者" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "昇順で並び換え" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "降順で並び替え" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "リポジトリが見つかりません。" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "データエラー" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "読み込み中..." - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:414 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "ログイン" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "%s へログイン" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "ユーザー名" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "パスワード" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "次回から自動的にサインイン" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "パスワードを忘れた?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "アカウントを持っていない?" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "サインイン" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "パスワードのリセット" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 #, python-format msgid "Reset Your Password to %s" msgstr "%sのパスワードをリセット" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 msgid "Reset Your Password" msgstr "パスワードのリセット" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "メールアドレス" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "キャプチャ" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 msgid "Send Password Reset Email" msgstr "パスワードリセットメールを送信" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "システムに登録されている場合、パスワードリセットのリンクを指定されたメールアドレスに送信します。" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 msgid "New Password" msgstr "新しいパスワード" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 msgid "Confirm New Password" msgstr "新しいパスワードの確認" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "サインアップ" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "%s へサインアップ" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "パスワード再入力" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "名前" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "名字" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "メールアドレス" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "まだブランチがありません" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "まだタグがありません" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "まだブックマークがありません" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 msgid "Admin Journal" msgstr "管理ジャーナル" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "ジャーナルフィルタ..." #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 msgid "Filter" msgstr "フィルター" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, python-format msgid "%s Entry" msgid_plural "%s Entries" msgstr[0] "%s 個のエントリ" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "アクション" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "リポジトリ" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "日時" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "アクセス元IPアドレス" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "まだアクションがありません" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "認証設定" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "認証" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "認証プラグイン" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "有効なプラグイン" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "カンマ区切りのプラグインの一覧です。Kallitheaはプラグインの並び順でユーザー認証を試みます" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "有効な組み込みプラグイン" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "プラグイン" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "保存" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 msgid "Repository Defaults" msgstr "リポジトリのデフォルト設定" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "リポジトリの種別" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 msgid "Private repository" msgstr "非公開リポジトリ" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "非公開リポジトリはコラボレーターとして明示的に追加された人のみ閲覧できます。" -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 msgid "Enable statistics" msgstr "統計を有効にする" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 msgid "Enable statistics window on summary page." msgstr "概要ページの統計ウィンドウを有効にします。" -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 msgid "Enable downloads" msgstr "ダウンロードを有効にする" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 msgid "Enable download menu on summary page." msgstr "概要ページのダウンロードメニューを有効にします。" -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 msgid "Enable locking" msgstr "ロックを有効にする" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "リポジトリのpullのロックを有効にします。" @@ -2687,7 +2460,7 @@ msgid "Edit Gist" msgstr "Gistを編集" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " @@ -2696,309 +2469,464 @@ "編集開始後にGistが更新されています。あなたの変更箇所をコピーしておき、 %(here)s " "をクリックして新しいバージョンを読み込みなおしてください。" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "Gist の説明..." -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "Gist 有効期間" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" msgstr "失効" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 msgid "Never" msgstr "しない" -#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "Gistを更新" -#: kallithea/templates/admin/gists/edit.html:147 -#: kallithea/templates/changeset/changeset_file_comment.html:105 +#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "キャンセル" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, python-format msgid "Private Gists for User %s" msgstr "ユーザー %s の非公開 Gists" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, python-format msgid "Public Gists for User %s" msgstr "ユーザー %s の公開 Gists" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "公開 Gists" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "新しい Gist を作成" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "作成日" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "まだgistがありません" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "Gistを新規作成" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." +#: kallithea/templates/admin/gists/new.html:45 +#, fuzzy +#| msgid "name this file..." +msgid "Name this gist ..." msgstr "ファイルに名前をつける..." -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "非公開 Gist を作成" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "公開 Gist を作成" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "リセット" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "Gist" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "URL" -#: kallithea/templates/admin/gists/show.html:37 +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 msgid "Public Gist" msgstr "公開 Gist" -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/templates/admin/gists/show.html:37 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "非公開 Gist" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:31 -#: kallithea/templates/changeset/changeset_file_comment.html:95 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "削除" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "このGistを削除してもよろしいですか？" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "編集" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "編集" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "Raw形式で表示" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "作成日" -#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "Raw形式で表示" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:431 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "アカウント" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "プロフィール" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 msgid "Email Addresses" msgstr "メールアドレス" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "APIキー" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 msgid "Owned Repositories" msgstr "所有しているリポジトリ" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 msgid "Watched Repositories" msgstr "ウォッチ中のリポジトリ" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 msgid "Show Permissions" msgstr "権限の表示" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "ビルトイン" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, python-format msgid "Confirm to reset this API key: %s" msgstr "このAPIキーをリセットしてもよろしいですか？: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 msgid "Expired" msgstr "期限切れ" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, python-format msgid "Confirm to remove this API key: %s" msgstr "このAPIキーを削除してもよろしいですか？: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 msgid "Remove" msgstr "削除" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 msgid "No additional API keys specified" msgstr "API キーが指定されていません" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 msgid "New API key" msgstr "新しいAPIキー" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "追加" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "プライマリ" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "このメールアドレスを削除してもよろしいですか？ : %s" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 msgid "No additional emails specified." msgstr "追加のメールアドレスはありません。" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "新しいメールアドレス" @@ -3006,176 +2934,230 @@ msgid "Change Your Account Password" msgstr "パスワードを変更してください" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "現在のパスワード" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "新しいパスワード" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "新しいパスワードの確認" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" -msgstr "アバターを変更できます : " +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +msgid "Current IP" +msgstr "現在の IP アドレス" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, fuzzy, python-format +#| msgid "Change avatar at" +msgid "Change %s avatar at" +msgstr "アバターを変更:" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "メールアドレス:" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "アバターは無効です" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "メールアドレスがありません。更新してください。" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "現在の IP アドレス" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 msgid "Repositories You Own" msgstr "あなたが所有者のリポジトリ" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "レコードが見つかりません" +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" +msgstr "名前" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 msgid "Repositories You are Watching" msgstr "あなたがウォッチしているリポジトリ" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "通知" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "すべて" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "コメント" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "プルリクエスト" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 msgid "Mark All Read" msgstr "すべて既読としてマーク" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +#, fuzzy +#| msgid "Mark All Read" +msgid "Mark as read" +msgstr "すべて既読としてマーク" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "まだ通知がありません" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 msgid "Show Notification" msgstr "通知を表示" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:430 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "通知" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 msgid "Default Permissions" msgstr "デフォルトの権限" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "全般" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "IPアドレスのホワイトリスト" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "匿名アクセス" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 #, fuzzy, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "ログインしなくても Kallithea にアクセスできるようにします。匿名ユーザーは %s ユーザーパーミッションを使います" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "選択したパーミッションで、各リポジトリのデフォルトパーミッションをリセットします。各リポジトリの既存のカスタムデフォルトパーミッション設定は無くなるので注意してください" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 #, fuzzy msgid "Apply to all existing repositories" msgstr "既存のリポジトリを import しますか？" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 msgid "Permissions for the Default user on new repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 msgid "Repository group" msgstr "リポジトリグループ" -#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "選択したパーミッションで、各リポジトリグループのデフォルトパーミッションをリセットします。各リポジトリグループの既存のカスタムデフォルトパーミッション設定は無くなるので注意してください" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 #, fuzzy msgid "Apply to all existing repository groups" msgstr "既存のリポジトリを import しますか？" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 #, fuzzy msgid "Permissions for the Default user on new repository groups." msgstr "親のリポジトリグループにセットされているパーミッションをコピーします。" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "ユーザーグループ" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 #, fuzzy msgid "" "All default permissions on each user group will be reset to chosen " @@ -3183,33 +3165,40 @@ "be lost" msgstr "選択したパーミッションで、各ユーザーグループのデフォルトパーミッションをリセットします。各ユーザーグループの既存のカスタムデフォルトパーミッション設定は無くなるので注意してください" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 msgid "Top level repository creation" msgstr "トップレベルリポジトリの作成" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 msgid "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 msgid "Repository creation with group write access" msgstr "グループ書き込み権限でのリポジトリ作成" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 #, fuzzy msgid "" "With this, write permission to a repository group allows creating " @@ -3217,73 +3206,95 @@ "mean nothing." msgstr "リポジトリグループに書き込みパーミッションを付与すると、グループ内にリポジトリを作成できるようになります" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 msgid "User group creation" msgstr "ユーザーグループ作成" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "リポジトリのフォーク" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "新規登録" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "外部認証アカウントのアクティベート" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, python-format msgid "Confirm to delete this IP address: %s" msgstr "このIPアドレスを削除してもよろしいですか？ : %s" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 msgid "All IP addresses are allowed." msgstr "すべてのIPアドレスが許可されています。" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "新しいIPアドレス" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "リポジトリグループ" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "グループ名" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "親グループ" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "親グループのパーミッションをコピー" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "親のリポジトリグループにセットされているパーミッションをコピーします。" @@ -3292,31 +3303,42 @@ msgid "%s Repository Group Settings" msgstr "%s リポジトリグループ設定" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "子グループを追加" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "設定" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "高度な設定" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "権限設定" @@ -3340,12 +3362,14 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "作成日" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3355,16 +3379,38 @@ msgid "Delete this repository group" msgstr "このリポジトリグループを削除" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "disabled" +msgid "Visible" +msgstr "無効" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "Add Repository" +msgid "Add repos" +msgstr "リポジトリを追加" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#, fuzzy +#| msgid "Add user group" +msgid "Add/Edit groups" +msgstr "ユーザーグループを追加" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "ユーザー/ユーザーグループ" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy @@ -3373,101 +3419,113 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "取消" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "新規追加" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "子要素にも適用" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "両方" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "このグループに属する全ての子要素のパーミッションを設定または無効化します。選択されていれば、非公開でないリポジトリや他のリポジトリも対象に含みます。" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" msgstr "グループに対してpullのロックを有効にします。このオプションはグループに含まれる全てのグループとリポジトリに適用されます。" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "このグループを削除" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "このグループを削除してもよろしいですか？: %s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "%s リポジトリグループダッシュボード" +#, fuzzy, python-format +#| msgid "Repository Group: %s" +msgid "Repository group %s" +msgstr "リポジトリグループ: %s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "ホーム" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "と" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 msgid "Repository Groups Administration" msgstr "リポジトリグループ管理" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 msgid "Number of Top-level Repositories" msgstr "トップレベルリポジトリ数" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 msgid "Clone remote repository" msgstr "リモートリポジトリをクローン" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。" -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "オプション：このリポジトリが属するグループを選択します" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "作成するリポジトリの種別を指定します" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "ランディングリビジョン" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3496,91 +3554,112 @@ msgstr "恐れいります。操作中にエラーが発生しました。 Kallithea サーバのログをチェックするか、管理者に問い合わせてください。" #: kallithea/templates/admin/repos/repo_edit.html:8 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, python-format msgid "%s Repository Settings" msgstr "%s リポジトリ設定" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 msgid "Extra Fields" msgstr "拡張フィールド" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "キャッシュ" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "リモート" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "統計" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 msgid "Parent" msgstr "Parent" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "保存" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 msgid "Manually set this repository as a fork of another from the list." msgstr "一覧から別のフォークとしてこのリポジトリを手動で設定します。" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 msgid "Public Journal Visibility" msgstr "公開ジャーナルでの可視性" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "公開ジャーナルから削除する" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 msgid "Add to Public Journal" msgstr "公開ジャーナルへ追加" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "公開ジャーナルでは、このリポジトリに対して行った操作のすべてが公開されます" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 msgid "Change Locking" msgstr "ロック" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 msgid "Confirm to unlock repository." msgstr "このリポジトリのロックを解除しますか？" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 msgid "Unlock Repository" msgstr "リポジトリのロックを解除" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 #, python-format msgid "Locked by %s on %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 msgid "Confirm to lock repository." msgstr "このリポジトリをロックしますか？" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 msgid "Lock Repository" msgstr "リポジトリをロック" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "リポジトリはロックされていません" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3588,31 +3667,38 @@ "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "このリポジトリを削除してもよろしいですか？ : %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 msgid "Delete this Repository" msgstr "このリポジトリを削除" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "このリポジトリには %s 個のフォークがあります" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "フォークの切り離し" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "フォークも削除" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3623,101 +3709,111 @@ msgid "Invalidate Repository Cache" msgstr "リポジトリのキャッシュを無効化" -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "このリポジトリのキャッシュを手動で無効化します。リポジトリへの初回アクセス時に再びキャッシュされます。" -#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 msgid "List of Cached Values" msgstr "キャッシュしている値の一覧" -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "Prefix" msgstr "プレフィックス" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "キー" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "アクティブ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "ラベル" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "このフィールドを削除してもよろしいですか？ : %s" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "新しいフィールドのキー" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "新しいフィールドのラベル" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "ラベルを入力してください" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "新しいフィールドの説明" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "フィールドの説明を入力してください" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "拡張フィールドは無効化されています" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 msgid "Private Repository" msgstr "非公開リポジトリ" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "[forked] repository" +msgid "Fork of repository" +msgstr "リポジトリを[フォーク]" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 msgid "Remote repository URL" msgstr "リモートリポジトリURL" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" msgstr "リモートリポジトリから変更を取り込む" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 msgid "Confirm to pull changes from remote repository." msgstr "リモートリポジトリから変更を取り込んでもよろしいですか？" -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "このリポジトリにリモートURLは設定されていません" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" msgstr "リポジトリID" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "これは何？" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "id を使ってURLを表現" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3730,33 +3826,33 @@ "上のURLを使えば、常にリポジトリにアクセスできます。\n" "この機能は、CIを使っている場合や、3rd pirtyのサービス向けにURLを固定化したいときに便利です。" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 msgid "Remote repository" msgstr "リモートリポジトリ" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" msgstr "リポジトリURL" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "オプション: リモートリポジトリのURLです。設定した場合、このURLから変更を取得することができます。" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定します" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "リポジトリの所有者を変更" -#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 msgid "Processed commits" msgstr "処理済みコミット数" -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 msgid "Processed progress" msgstr "処理状況" @@ -3769,152 +3865,194 @@ msgstr "現在の統計情報をリセットしてもよろしいですか？" #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 msgid "Repositories Administration" msgstr "リポジトリ管理" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "状態" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 msgid "Settings Administration" msgstr "設定管理" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "VCS" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "再マップと再スキャン" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "表示" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "フック" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "全文検索" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "システム情報" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "テストメールの送信" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "送信" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "サイト名" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "このKallitheaサービスのカスタムタイトルを設定します。" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "このKallitheaサービスのカスタムタイトルを設定します。" - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "HTTP認証レルム" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems like Google" +" Analytics or Piwik, but also to perform " +"instance-specific customizations like adding a " +"project banner at the top of every page." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:37 +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "ReCaptcha 公開鍵" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "reCaptchaの公開鍵。" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "ReCaptcha 秘密鍵" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "reCaptchaの秘密鍵。この値が設定されると登録時のキャプチャが有効になります。" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 msgid "Save Settings" msgstr "設定を保存" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "組み込みのMercurialフック (編集不可)" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "フックを使うと、リポジトリへのプッシュやプルといった特定のイベントに合わせて、何らかのアクションを実行できます。フック機能では、Pythonの関数を呼び出したり、外部アプリケーションを起動したりできます。" #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 msgid "Custom Hooks" msgstr "カスタムフック" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "フックの削除に失敗しました" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Rescan option" +msgid "Rescan options" msgstr "再スキャンオプション" -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 msgid "Delete records of missing repositories" msgstr "見つからないリポジトリのレコードを削除" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 msgid "" "Check this option to remove all comments, pull requests and other records" " related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "すべてのリポジトリのキャッシュを無効化する" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 #, fuzzy msgid "Check this to reload data and clear cache keys for all repositories." msgstr "すべてのリポジトリのキャッシュを無効化する" -#: kallithea/templates/admin/settings/settings_mapping.html:23 +#: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 msgid "Install Git hooks" msgstr "Gitフックをインストール" -#: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." msgstr "各リポジトリに Kallitheas の Gitフックがインストールされているか確認してください。現在のフックは最新版に更新されます" -#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 msgid "Overwrite existing Git hooks" msgstr "既存のGitフックを上書きする" -#: kallithea/templates/admin/settings/settings_mapping.html:30 +#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " "not seem to come from Kallithea. WARNING: This operation will destroy any" @@ -3923,115 +4061,125 @@ "GitフックをインストールするとKallitheaから設定されたものであっても既存のフックは全て上書きされます。警告: " "この操作はあなたが手動で配置したGitのカスタムフックを全て破壊します!" -#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/templates/admin/settings/settings_mapping.html:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "リポジトリを再スキャン" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "インデックス作成時の設定" -#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 msgid "Build from scratch" msgstr "一度削除してから再度インデックスを作成" -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "このオプションを使うと、全文検索の機能が正しく発揮されるよう、 Kallithea 中の全てのファイルのインデックスを再生成します。" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "再インデックス" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." +msgstr "更新を確認中..." + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 msgid "Kallithea version" msgstr "Kallithea バージョン" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "更新を確認" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "Kallithea の設定ファイル" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "Python バージョン" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" -msgstr "プラットフォーム" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Check for updates" +msgstr "更新を確認" #: kallithea/templates/admin/settings/settings_system.html:8 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 +msgid "Kallithea configuration file" +msgstr "Kallithea の設定ファイル" + +#: kallithea/templates/admin/settings/settings_system.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 +msgid "Python version" +msgstr "Python バージョン" + +#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 +msgid "Platform" +msgstr "プラットフォーム" + +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 msgid "Git version" msgstr "Git バージョン" -#: kallithea/templates/admin/settings/settings_system.html:9 +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 msgid "Git path" msgstr "Git パス" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Upgrade info endpoint" msgstr "更新情報のエンドポイント" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "ノート: サーバーがこのURLにアクセスできることを確認して下さい" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "更新を確認中..." - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "Python パッケージ" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "Web" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "VCSの操作にSSLを必須とする" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "プッシュ、プル時にSSLを要求します。SSLでない場合はHTTP Error 406: Not Acceptableを返します。" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "プッシュ後にリポジトリのサイズを表示する" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "ユーザーのプッシュコマンドを記録する" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "ユーザーのプルコマンドを記録する" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "プッシュ後にリポジトリを更新する (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 msgid "Mercurial extensions" msgstr "Mercurialエクステンション" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 msgid "Enable largefiles extension" msgstr "largefilesエクステンションを有効にする" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 msgid "Enable hgsubversion extension" msgstr "hgsubversionエクステンションを有効にする" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." @@ -4039,47 +4187,56 @@ "hgsubversion " "ライブラリのインストールが必要です。リモートのSVNリポジトリをクローンしてMercurialリポジトリに変換するすることが可能です。" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 msgid "Location of repositories" msgstr "リポジトリの場所" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting" " take effect." msgstr "アンロックする。この設定を有効にするためにはKallitheaの再起動が必要です。" -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "リポジトリを保存するファイルシステム上の場所。この値を変更した場合、サーバーの再起動とリポジトリフォルダの再スキャンが必要です。" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "一般" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "リポジトリの拡張フィールドを使用する" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "追加のカスタムフィールドをリポジトリ毎に保存することを許可します。" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "Kallitheaのバージョンを表示する" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "フッターに表示されるKallitheaのバージョン番号の表示、非表示を設定します。" -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "Gravatorsを利用する" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 #, fuzzy msgid "" "Gravatar URL allows you to use another avatar server application.\n" @@ -4104,22 +4261,38 @@ "{size} サーバーアプリケーションに要求する画像のサイズ\n" "{netloc} Kallithea サーバーのアドレスまたはホスト名" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +msgid "Clone URL" +msgstr "クローンURL" + +#: kallithea/templates/admin/settings/settings_visual.html:43 +#, fuzzy +#| msgid "" "Schema of clone URL construction eg. +#| '{scheme}://{user}@{netloc}/{repo}'." "\n" " +#| The following " "variables are available:\n" " +#| {scheme} 'http' " "or 'https' sent from running Kallithea server,\n" " +#| {user} current " "user username,\n" " +#| {netloc} network " "location/server host of running Kallithea server,\n" " +#| {repo} full " "repository name,\n" " +#| {repoid} ID of " "repository, can be used to contruct clone-by-id" msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." "\n" -" The following " +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user" +" username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" msgstr "" "クローン URL のスキーマは、 '{scheme}://{user}@{netloc}/{repo}' " "のような形式にします。使える変数は下記の通りです:\n" @@ -4134,83 +4307,105 @@ " {repoid} リポジトリの " "ID。 clone-by-id に使います。" -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "ダッシュボードの項目" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repository Size" +msgid "Repository page size" +msgstr "リポジトリサイズ" + +#: kallithea/templates/admin/settings/settings_visual.html:57 +#, fuzzy +#| msgid "" "Number of items displayed in the admin pages grids before +#| pagination is " "shown." msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." -msgstr "メインページダッシュボードで1ページに表示する要素数。" +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "管理ページで、ページ分割しないでグリッドに表示する項目の数" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +#, fuzzy +#| msgid "Admin pages items" +msgid "Admin page size" +msgstr "管理ページの項目" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "管理ページの項目" - -#: kallithea/templates/admin/settings/settings_visual.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "管理ページで、ページ分割しないでグリッドに表示する項目の数" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 msgid "Icons" msgstr "アイコン" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 msgid "Show public repository icon on repositories" msgstr "公開リポジトリのアイコンを表示する" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 msgid "Show private repository icon on repositories" msgstr "非公開リポジトリのアイコンを表示する" -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 msgid "Show public/private icons next to repository names." msgstr "リポジトリ名の隣に公開/非公開アイコンを表示します。" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 msgid "Meta Tagging" msgstr "メタタグ" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "次のメタタグを変換する:" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "リポジトリの説明のメタタグを解析して色つきのタグに変換します。" +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 +msgid "Stylify recognised meta tags:" +msgstr "次のメタタグを変換する:" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "ユーザーグループを追加" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "ユーザーグループ" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "ユーザーグループを追加" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "このユーザーグループの簡潔な説明を書いてください。" #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "%s ユーザーグループ設定" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 msgid "Show Members" msgstr "メンバーを表示" @@ -4220,13 +4415,15 @@ msgstr "ユーサーグループ: %s" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "メンバー" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "このユーザーグループを削除してもよろしいですか？: %s" @@ -4235,48 +4432,59 @@ msgid "Delete this user group" msgstr "このユーザーグループを削除" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "まだメンバーがいません" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "グループメンバーを選ぶ" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "有効なメンバー" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 msgid "User Groups Administration" msgstr "ユーザーグループ管理" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "ユーザーを追加" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "ユーザー" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "ユーザーを追加" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "パスワード再入力" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "%s ユーザー設定" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "メールアドレス" @@ -4286,12 +4494,14 @@ msgstr "ユーザー: %s" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "アカウントのソース" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "最終ログイン日時" @@ -4300,7 +4510,8 @@ msgstr "グループのメンバー数" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "このユーザーを削除してもよろしいですか？ : %s" @@ -4309,433 +4520,496 @@ msgid "Delete this user" msgstr "このユーザーを削除" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "%s から継承" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "アバターを変更:" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "メールアドレスがありません。このユーザーのメールアドレスを更新してください。" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "アカウントのソースでの名前" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "新しいパスワード 再入力" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 msgid "Users Administration" msgstr "ユーザー管理" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "認証タイプ" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "サーバーインスタンス: %s" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "サポート" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "Mercurialリポジトリ" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "Gitリポジトリ" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 msgid "Create Fork" msgstr "フォークを作成" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "要約" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "履歴" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "ファイル" -#: kallithea/templates/base/base.html:142 -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 msgid "Options" msgstr "オプション" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:147 +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 msgid "Compare Fork" msgstr "フォークと比較" -#: kallithea/templates/base/base.html:154 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 msgid "Compare" msgstr "比較" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:331 +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 msgid "Search" msgstr "検索" -#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:155 +#: kallithea/tests/data/templates/base/base.html.py:399 msgid "Unlock" msgstr "アンロック" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:157 +#: kallithea/tests/data/templates/base/base.html.py:405 msgid "Lock" msgstr "ロック" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:165 +#: kallithea/tests/data/templates/base/base.html.py:413 msgid "Follow" msgstr "フォロー" -#: kallithea/templates/base/base.html:171 +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 msgid "Unfollow" msgstr "アンフォロー" -#: kallithea/templates/base/base.html:174 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 msgid "Fork" msgstr "フォーク" -#: kallithea/templates/base/base.html:175 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/base/base.html:170 +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 msgid "Create Pull Request" msgstr "プルリクエストを作成" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "%s のプルリクエストを表示" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 msgid "Switch To" msgstr "ブランチの切り替え" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:485 +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 msgid "No matches found" msgstr "一致するものが見つかりません" -#: kallithea/templates/base/base.html:305 +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "最近の活動を表示" -#: kallithea/templates/base/base.html:311 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 msgid "Public journal" msgstr "公開ジャーナル" -#: kallithea/templates/base/base.html:317 +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 msgid "Show public gists" msgstr "公開 gists を表示" -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:311 +#: kallithea/tests/data/templates/base/base.html.py:525 msgid "All Public Gists" msgstr "すべての公開 Gists" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 msgid "My Public Gists" msgstr "公開 Gists" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 msgid "My Private Gists" msgstr "非公開 Gists" -#: kallithea/templates/base/base.html:330 +#: kallithea/templates/base/base.html:319 +#: kallithea/tests/data/templates/base/base.html.py:540 msgid "Search in repositories" msgstr "リポジトリから検索" -#: kallithea/templates/base/base.html:353 -#: kallithea/templates/base/base.html:354 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 msgid "My Pull Requests" msgstr "私のプルリクエスト" -#: kallithea/templates/base/base.html:377 +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 msgid "Not Logged In" msgstr "ログインしていません" -#: kallithea/templates/base/base.html:384 +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 msgid "Login to Your Account" msgstr "あなたのアカウントにログイン" +#: kallithea/templates/base/base.html:385 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" +msgstr "パスワードを忘れた?" + +#: kallithea/templates/base/base.html:389 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "アカウントを持っていない?" + #: kallithea/templates/base/base.html:407 -msgid "Forgot password ?" -msgstr "パスワードを忘れた?" - -#: kallithea/templates/base/base.html:434 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "ログアウト" -#: kallithea/templates/base/base.html:615 -msgid "Keyboard shortcuts" -msgstr "キーボードショートカット" - -#: kallithea/templates/base/base.html:624 -msgid "Site-wide shortcuts" -msgstr "サイト全体" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 msgid "Inherit defaults" msgstr "デフォルト権限を継承" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "リポジトリを作成する" +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 +msgid "Select this option to allow repository creation for this user" +msgstr "ユーザーにリポジトリ作成を許可する場合はこのオプションを選んでください" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "ユーザーにリポジトリ作成を許可する場合はこのオプションを選んでください" - -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "ユーザーグループを作成" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "ユーザーにユーザーグループの作成を許可する場合はこのオプションを選んでください" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "リポジトリをフォークする" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "ユーザーにリポジトリのフォークを許可する場合はこのオプションを選んでください" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "表示" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "まだ権限設定がありません" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "権限" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "権限を編集" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "権限が設定されていません" -#: kallithea/templates/base/root.html:22 +#: kallithea/templates/base/root.html:25 +#: kallithea/tests/data/templates/base/root.html.py:85 msgid "Add Another Comment" msgstr "別のコメントを追加" -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 +#: kallithea/templates/base/root.html:26 +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 msgid "Stop following this repository" msgstr "このリポジトリのフォローをやめる" -#: kallithea/templates/base/root.html:24 +#: kallithea/templates/base/root.html:27 +#: kallithea/tests/data/templates/base/root.html.py:89 msgid "Start following this repository" msgstr "このリポジトリのフォローする" -#: kallithea/templates/base/root.html:25 +#: kallithea/templates/base/root.html:28 +#: kallithea/tests/data/templates/base/root.html.py:91 msgid "Group" msgstr "グループ" -#: kallithea/templates/base/root.html:26 +#: kallithea/templates/base/root.html:29 +#: kallithea/tests/data/templates/base/root.html.py:93 msgid "members" msgstr "メンバー" -#: kallithea/templates/base/root.html:27 +#: kallithea/templates/base/root.html:30 +#: kallithea/tests/data/templates/base/root.html.py:95 msgid "Loading ..." msgstr "読み込み中..." -#: kallithea/templates/base/root.html:28 +#: kallithea/templates/base/root.html:31 +#: kallithea/tests/data/templates/base/root.html.py:97 msgid "loading ..." msgstr "読み込み中..." -#: kallithea/templates/base/root.html:29 +#: kallithea/templates/base/root.html:32 +#: kallithea/tests/data/templates/base/root.html.py:99 msgid "Search truncated" msgstr "検索結果は省略されています" -#: kallithea/templates/base/root.html:30 +#: kallithea/templates/base/root.html:33 +#: kallithea/tests/data/templates/base/root.html.py:101 msgid "No matching files" msgstr "マッチするファイルはありません" -#: kallithea/templates/base/root.html:31 +#: kallithea/templates/base/root.html:34 +#: kallithea/tests/data/templates/base/root.html.py:103 msgid "Open New Pull Request from {0}" msgstr "新しいプルリクエストを{0}から作成" -#: kallithea/templates/base/root.html:32 +#: kallithea/templates/base/root.html:35 +#: kallithea/tests/data/templates/base/root.html.py:105 msgid "Open New Pull Request for {0} → {1}" msgstr "{0} → {1}から新しいプルリクエストを作成する" -#: kallithea/templates/base/root.html:33 +#: kallithea/templates/base/root.html:36 +#: kallithea/tests/data/templates/base/root.html.py:107 msgid "Show Selected Changesets {0} → {1}" msgstr "選択したチェンジセット{0} → {0}を表示" -#: kallithea/templates/base/root.html:34 +#: kallithea/templates/base/root.html:37 +#: kallithea/tests/data/templates/base/root.html.py:109 #, fuzzy msgid "Selection Link" msgstr "セレクション・リンク" -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/base/root.html:38 +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 msgid "Collapse Diff" msgstr "差分をたたむ" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:39 +#: kallithea/tests/data/templates/base/root.html.py:113 msgid "Expand Diff" msgstr "差分を表示" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:40 +#: kallithea/tests/data/templates/base/root.html.py:115 msgid "Failed to revoke permission" msgstr "権限の取消に失敗しました" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "権限 {0}: {1} を取り消してもよろしいですか？" -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "有効" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "無効" - -#: kallithea/templates/base/root.html:42 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "リビジョンを選択" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 msgid "Specify changeset" msgstr "チェンジセットを指定" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "%s ブックマーク" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "ブックマークを比較" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "作成者" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "リビジョン" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "%s ブランチ" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "ブランチを比較" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "昇順で並び換え" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "降順で並び替え" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "レコードが見つかりません" + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "データエラー" + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." +msgstr "読み込み中..." #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "%s チェンジログ" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "%d / %d リビジョンを表示" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "選択を解除" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 msgid "Go to tip of repository" msgstr "リポジトリの最新のリビジョン(tip)に移動" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "%s とフォークを比較" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "フォーク元(%s)と比較" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 msgid "Branch filter:" msgstr "ブランチフィルタ:" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 #, fuzzy, python-format -#| msgid "" "Changeset status: %s\n" "Click to open associated pull request %s" msgid "" "Changeset status: %s by %s\n" "Click to open associated pull request %s" @@ -4743,512 +5017,749 @@ "チェンジセットステータス: %s\n" "関連するプルリクエスト %s を開く" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/changelog/changelog_summary_data.html:24 +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 #, fuzzy, python-format -#| msgid "Changeset status: %s" msgid "Changeset status: %s by %s" msgstr "チェンジセットステータス: %s" -#: kallithea/templates/changelog/changelog.html:116 -#: kallithea/templates/compare/compare_cs.html:63 +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 msgid "Expand commit message" msgstr "コミットメッセージを展開" -#: kallithea/templates/changelog/changelog.html:125 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/changelog/changelog.html:116 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "チェンジセットにコメントがあります" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:57 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "ブックマーク %s" -#: kallithea/templates/changelog/changelog.html:141 -#: kallithea/templates/changelog/changelog_summary_data.html:63 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#: kallithea/templates/compare/compare_cs.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:203 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "タグ %s" -#: kallithea/templates/changelog/changelog.html:146 -#: kallithea/templates/changelog/changelog_summary_data.html:68 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "ブランチ %s" -#: kallithea/templates/changelog/changelog.html:311 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "まだ変更がありません" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "削除" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "変更" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:47 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "追加" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "%s ファイルに影響" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "リビジョン" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "コミットメッセージ" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "経過時間" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "作成者" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "Refs" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "Kallithea経由で直接ファイルを追加またはアップロード" -#: kallithea/templates/changelog/changelog_summary_data.html:87 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "新しいファイルを追加" -#: kallithea/templates/changelog/changelog_summary_data.html:93 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 msgid "Push new repository" msgstr "新しいリポジトリをプッシュ" -#: kallithea/templates/changelog/changelog_summary_data.html:101 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "存在するリポジトリをプッシュ" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "%s チェンジセット" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "親リビジョン" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "子リビジョン" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:39 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "チェンジセットステータス" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "diffとして差分を表示" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "パッチとして差分を表示" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:75 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "差分をダウンロード" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 msgid "Merge" msgstr "マージ" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 #, fuzzy msgid "Grafted from:" msgstr "作成日" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 #, fuzzy msgid "Replaced by:" msgstr "作成日" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 #, fuzzy msgid "Preceded by:" msgstr "作成日" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:329 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "%s ファイルに影響" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:62 -#: kallithea/templates/pullrequests/pullrequest_show.html:331 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "%s ファイルに影響。 %s 個の追加と %s 個の削除" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 msgid "Show full diff anyway" msgstr "とにかくすべての差分を表示" -#: kallithea/templates/changeset/changeset.html:231 -#: kallithea/templates/changeset/changeset.html:268 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 msgid "No revisions" msgstr "リビジョンなし" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 #, fuzzy msgid "on pull request" msgstr "プルリクエスト #%s にコメント" -#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 msgid "No title" msgstr "No title" -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 #, fuzzy msgid "on this changeset" msgstr "チェンジセットはありません" -#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 msgid "Delete comment?" msgstr "コメントを削除しますか？" -#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 msgid "Status change" msgstr "ステータスを変更" -#: kallithea/templates/changeset/changeset_file_comment.html:59 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 #, fuzzy msgid "Commenting on line." msgstr "{1} 行目にコメント" -#: kallithea/templates/changeset/changeset_file_comment.html:60 +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 #, fuzzy msgid "" "Comments are in plain text. Use @username inside this text to notify " "another user." msgstr "テキスト内で @username を使うと、そのユーザーに通知されます。" -#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 msgid "Set changeset status" msgstr "リビジョンステータスを設定" -#: kallithea/templates/changeset/changeset_file_comment.html:69 +#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 msgid "Vote for pull request status" msgstr "プルリクエストステータスの投票" -#: kallithea/templates/changeset/changeset_file_comment.html:75 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 msgid "No change" msgstr "変更なし" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 #, fuzzy msgid "Finish pull request" msgstr "プルリクエスト #%s にコメント" -#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 #, fuzzy msgid "Close" msgstr "(閉鎖済み)" -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 msgid "Submitting ..." msgstr "送信中..." -#: kallithea/templates/changeset/changeset_file_comment.html:104 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "コメント" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "コメントにはログインする必要があります。" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "今すぐログインする" -#: kallithea/templates/changeset/changeset_file_comment.html:116 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "隠す" -#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d 個のコメント" -#: kallithea/templates/changeset/changeset_file_comment.html:129 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "%d inline" -#: kallithea/templates/changeset/changeset_file_comment.html:130 +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 #, python-format msgid "%d general" msgid_plural "%d general" msgstr[0] "%d general" #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "%s チェンジセット" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "チェンジセットステータス: %s" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "影響のあるファイル" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "削除されたファイル" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "変更しない" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 msgid "Deleted" msgstr "削除" -#: kallithea/templates/changeset/diff_block.html:57 +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 msgid "Renamed" msgstr "リネーム" -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "%s は未知のリビジョンです" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "ファイル名がありません" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "追加されたファイル" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "このファイルのすべての差分を表示" -#: kallithea/templates/changeset/diff_block.html:69 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "このファイルの差分を並べて表示" -#: kallithea/templates/changeset/diff_block.html:83 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "インラインコメントを表示" #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "チェンジセットはありません" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "祖先" - -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "チェンジセットステータス: %s" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +#, fuzzy +#| msgid "Common ancestor" +msgid "Merge Ancestor" +msgstr "共通の祖先" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:85 +#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 msgid "Show merge diff" msgstr "マージの差分を表示" -#: kallithea/templates/compare/compare_cs.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:321 -msgid "Common ancestor" -msgstr "共通の祖先" - -#: kallithea/templates/compare/compare_cs.html:99 -msgid "No common ancestor found - repositories are unrelated" -msgstr "共通の祖先が見つかりません - リポジトリ同士に関連がありません" - -#: kallithea/templates/compare/compare_cs.html:107 +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 msgid "is" msgstr "is" -#: kallithea/templates/compare/compare_cs.html:108 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, python-format msgid "%s changesets" msgstr "%s チェンジセット" -#: kallithea/templates/compare/compare_cs.html:109 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 msgid "behind" msgstr "behind" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "%s 比較" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "リビジョンを比較" #: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "入れ替え" #: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "リビジョン、ブランチ、ブックマークもしくはタグの比較を行います。" #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "%s コミットを表示" -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "すべての差分を表示" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "公開リポジトリ" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "リポジトリを作成しています..." -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "まだチェンジセットがありません" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "%s の RSS フィードを購読" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "%s の ATOM フィードを購読" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "作成中" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "%(user)s がチェンジセットにコメント %(age)s" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "Comment from %s on %s changeset %s" +msgid "Comment on Changeset \"%s\"" msgstr "%sから%sのチェンジセット%sに対するコメント" -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "チェンジセットを次に変更" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "これは自動的に送信される通知です。このメールに返信しないでください。" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset flow" +msgid "Changeset on" +msgstr "変更の流れ" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "ブランチ" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "ステータスを変更" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "This pull request has been closed and can not be updated." +msgid "The pull request has been closed." +msgstr "このプルリクエストはすでにクローズされていて、更新することはできません。" + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "こんにちは %s" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 msgid "We have received a request to reset the password for your account." msgstr "あなたのアカウントのパスワードリセットリクエストを受け取りました。" -#: kallithea/templates/email_templates/password_reset.html:8 +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 msgid "" "This account is however managed outside this system and the password " "cannot be changed here." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 msgid "To set a new password, click the following link" msgstr "新しいパスワードを設定するために、次のリンクをクリックしてください" -#: kallithea/templates/email_templates/password_reset.html:13 +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "パスワードリセットのリクエストをしていない場合、このメッセージは無視してください。" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, fuzzy, python-format +#| msgid "%s mentioned you on %s pull request \"%s\"" +msgid "Mention on Pull Request %s \"%s\" by %s" msgstr "%sさんが%sへのプルリクエスト \"%s\"でメンションしました" -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, fuzzy, python-format +#| msgid "%s requested your review of %s pull request \"%s\"" +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" msgstr "%sさんが%sへのプルリクエスト \"%s\"でレビューを要求しています" +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "on pull request" +msgid "Pull request from" +msgstr "プルリクエスト #%s にコメント" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +#, fuzzy +#| msgid "Date" +msgid "at" +msgstr "日時" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" +msgstr "" + #: kallithea/templates/email_templates/pull_request_comment.html:4 -#, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "%sから%sのプルリクエスト \"%s\"に対するコメント" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 +#, fuzzy, python-format +#| msgid "%s mentioned you on %s pull request \"%s\"" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "%sさんが%sへのプルリクエスト \"%s\"でメンションしました" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s from %s#%s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "%s からのプルリクエスト" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "プルリクエストに[コメント]" + +#: kallithea/templates/email_templates/registration.html:22 #, fuzzy -msgid "The comment closed the pull request with status" -msgstr "%s がプルリクエスト\"%s\" にコメントしました" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -#, fuzzy -msgid "The comment was made with status" -msgstr "プルリクエストを以下のステータスで閉じました：" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "このユーザを閲覧する" +#| msgid "Group name" +msgid "Full Name" +msgstr "グループ名" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5266,83 +5777,105 @@ msgstr "%s ファイル差分" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "%s ファイル" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "%s ファイルを追加" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "場所" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "ファイル名..." -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "または" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "アップロードファイル" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "新しいファイルを作成" #: kallithea/templates/files/files_add.html:53 +#: kallithea/tests/data/templates/files/files_add.html.py:241 #, fuzzy msgid "New file type" msgstr "新しいファイル" -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 msgid "Commit Changes" msgstr "変更をコミット" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "前のリビジョン" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "次のリビジョン" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "このブランチで追跡" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "ファイル一覧を検索" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "ファイル一覧を読み込み中..." -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 msgid "Size" msgstr "サイズ" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 msgid "Last Revision" msgstr "最後のリビジョン" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 msgid "Last Modified" msgstr "最終更新日" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 msgid "Last Committer" msgstr "最後の作成者" @@ -5352,7 +5885,7 @@ msgstr "%s のファイルを削除" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "ファイルを削除" @@ -5365,111 +5898,131 @@ msgid "Edit file" msgstr "ファイルを編集" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "アノテーションを表示" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 msgid "Download as Raw" msgstr "Raw形式でダウンロード" -#: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "ソース" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "ファイルを編集" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "%s 人の作成者" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "このリビジョンとの差分" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "このリビジョンを表示" +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 +msgid "Show Full History" +msgstr "全ての履歴を表示" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "全ての履歴を表示" - -#: kallithea/templates/files/files_source.html:11 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "作成者を表示" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "ソースを表示" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, fuzzy, python-format +#| msgid "Edit on Branch:%s" +msgid "Edit on Branch: %s" msgstr "ブランチ:%s で編集" -#: kallithea/templates/files/files_source.html:41 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 msgid "Editing binary files not allowed" msgstr "バイナリファイルの編集は行えません" -#: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 msgid "Editing files allowed only when on branch head revision" msgstr "ファイル編集はブランチのヘッドリビジョンでのみ許可されています" -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/files/files_source.html:41 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "ファイルの削除はブランチのヘッドリビジョンでのみ行えます" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "バイナリファイル (%s)" -#: kallithea/templates/files/files_source.html:74 +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 #, fuzzy msgid "File is too big to display." msgstr "表示するには大きすぎるファイルです" -#: kallithea/templates/files/files_source.html:76 +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 #, fuzzy msgid "Show full annotation anyway." msgstr "とにかくすべての差分を表示" -#: kallithea/templates/files/files_source.html:78 +#: kallithea/templates/files/files_source.html:73 +#: kallithea/tests/data/templates/files/files_source.html.py:133 #, fuzzy msgid "Show as raw." msgstr "Raw形式で表示" #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "アノテーション" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "戻る" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "そのパスにはファイルはありません" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "%s フォロワー" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "フォロワー" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "フォロー開始日 -" @@ -5478,70 +6031,80 @@ msgid "Fork repository %s" msgstr "リポジトリ %s をフォーク" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "フォーク名" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定します。" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "非公開" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "権限のコピー" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "フォーク元リポジトリから権限をコピーします" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "クローン後にupdateする" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "クローンした後にソースをチェックアウトします" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "このリポジトリをフォーク" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "%s フォーク" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "フォーク" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "フォークしました" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "まだフォークがありません" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 msgid "ATOM journal feed" msgstr "ATOM ジャーナルフィード" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "RSS ジャーナルフィード" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "私のリポジトリ" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "まだエントリがありません" @@ -5555,34 +6118,45 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 msgid "New Pull Request" msgstr "新しいプルリクエスト" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "タイトル" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "このプルリクエストの簡潔な説明を書いてください" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "変更の流れ" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "元のリポジトリ" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "相手のリポジトリ" @@ -5617,7 +6191,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "クローズ" @@ -5635,118 +6211,152 @@ msgstr "このプルリクエストには %s件のコメントがありますが削除してもよろしいですか？" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, python-format msgid "%s Pull Request %s" msgstr "%s プルリクエスト %s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, fuzzy, python-format msgid "Pull request %s from %s#%s" msgstr "%s からのプルリクエスト" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 msgid "Summarize the changes" msgstr "変更の概要" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "レビュアーの投票結果" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "投票からプルリクエストのステータスを計算" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "投票からプルリクエストのステータスを計算" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "未レビュー" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "%d 人のレビュアー" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "プルリクエストはすべてのレビュアーにレビューされました" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 msgid "There are no reviewers" msgstr "レビュアーがいません" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "Origin" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 msgid "on" msgstr "on" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "Target" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "変更を取得:" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "更新" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 +#, fuzzy +#| msgid "Registration" +msgid "Next iteration" +msgstr "新規登録" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 msgid "Current revision - no change" msgstr "現在のリビジョン ｰ 変更なし" -#: kallithea/templates/pullrequests/pullrequest_show.html:215 +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 msgid "" -"Pull requests do not change once created. Select a revision and save to " -"replace this pull request with a new one." +"Pull request iterations do not change content once created. Select a " +"revision and save to make a new iteration." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:224 +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +msgid "Save Changes" +msgstr "変更を保存" + +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +msgid "Cancel Changes" +msgstr "変更をキャンセル" + +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 msgid "Pull Request Reviewers" msgstr "プルリクエストレビュアー" -#: kallithea/templates/pullrequests/pullrequest_show.html:249 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 msgid "Remove reviewer" msgstr "レビュアーを削除" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 msgid "Type name of reviewer to add" msgstr "追加するレビュアーの名前を入力" -#: kallithea/templates/pullrequests/pullrequest_show.html:269 +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 msgid "Potential Reviewers" msgstr "レビュワー候補" -#: kallithea/templates/pullrequests/pullrequest_show.html:272 +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 msgid "Click to add the repository owner as reviewer:" msgstr "クリックしてリポジトリの所有所をレビュアーに追加:" -#: kallithea/templates/pullrequests/pullrequest_show.html:295 -msgid "Save Changes" -msgstr "変更を保存" +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 +msgid "Pull Request Content" +msgstr "プルリクエストの内容" #: kallithea/templates/pullrequests/pullrequest_show.html:296 -#, fuzzy -msgid "Save Updates as New Pull Request" -msgstr "新しいプルリクエストとして保存" - -#: kallithea/templates/pullrequests/pullrequest_show.html:297 -msgid "Cancel Changes" -msgstr "変更をキャンセル" - -#: kallithea/templates/pullrequests/pullrequest_show.html:307 -msgid "Pull Request Content" -msgstr "プルリクエストの内容" +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +msgid "Common ancestor" +msgstr "共通の祖先" #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format @@ -5763,240 +6373,489 @@ msgid "Pull Requests to '%s'" msgstr "'%s' へのプルリクエスト" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "新しいプルリクエストを作成" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "%s へのプルリクエストを表示" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "%s からのプルリクエストを表示" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "クローズしたプルリクエストを隠す（クローズしていないプルリクエストのみ表示する）" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "クローズしたプルリクエストも表示(クローズしていないプルリクエストに加えて)" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "作成したプルリクエスト" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +#, fuzzy +#| msgid "Pull Request Reviewers" +msgid "Pull Requests Needing My Review" +msgstr "プルリクエストレビュアー" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "参加しているプルリクエスト" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "%s 検索" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 msgid "Search in All Repositories" msgstr "全てのリポジトリから検索" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "検索キーワード" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "検索対象" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "ファイルの内容" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "コミットメッセージ" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "ファイル名" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "権限がありません" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "%s 統計情報" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "%s ATOM フィード" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "%s RSS フィード" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "有効にする" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "収集した統計情報: " -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "ファイル" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "もっと表示" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 msgid "commits" msgstr "コミット" +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "追加されたファイル" + +#: kallithea/templates/summary/statistics.html:390 +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" +msgstr "変更されたファイル" + #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "追加されたファイル" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" -msgstr "変更されたファイル" +#: kallithea/tests/data/templates/summary/statistics.html.py:153 +msgid "files removed" +msgstr "削除されたファイル" #: kallithea/templates/summary/statistics.html:393 -msgid "files removed" -msgstr "削除されたファイル" +#: kallithea/tests/data/templates/summary/statistics.html.py:155 +msgid "commit" +msgstr "コミット" + +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 +msgid "file added" +msgstr "追加されたファイル" #: kallithea/templates/summary/statistics.html:395 -msgid "commit" -msgstr "コミット" +#: kallithea/tests/data/templates/summary/statistics.html.py:159 +msgid "file changed" +msgstr "変更されたファイル" #: kallithea/templates/summary/statistics.html:396 -msgid "file added" -msgstr "追加されたファイル" - -#: kallithea/templates/summary/statistics.html:397 -msgid "file changed" -msgstr "変更されたファイル" - -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "削除されたファイル" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "%s 要約" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "リポジトリは %s によってロックされました" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "リポジトリはロックされていません" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "フォーク元" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "クローン元" +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 +msgid "Show by ID" +msgstr "IDで表示" + #: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "クローンURL" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/summary/summary.html.py:143 msgid "Show by Name" msgstr "名前で表示" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "IDで表示" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "トレンドファイル" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 msgid "Download" msgstr "ダウンロード" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 msgid "There are no downloads yet" msgstr "まだダウンロードがありません" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 msgid "Downloads are disabled for this repository" msgstr "このリポジトリのダウンロードは無効化されています" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:108 +#: kallithea/tests/data/templates/summary/summary.html.py:190 msgid "Download as zip" msgstr "ZIPでダウンロード" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:112 +#: kallithea/tests/data/templates/summary/summary.html.py:194 msgid "Check this to download archive with subrepos" msgstr "チェックするとダウンロードアーカイブにサブリポジトリが含まれます" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:114 +#: kallithea/tests/data/templates/summary/summary.html.py:196 msgid "With subrepos" msgstr "サブリポジトリを含める" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "リポジトリサイズ" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "フィード" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 msgid "Latest Changes" msgstr "最近の変更" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 msgid "Quick Start" msgstr "クイックスタート" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "リビジョン %s:%s の README ファイル" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "%s を %s でダウンロード" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "%s タグ" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "タグを比較" +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "ダッシュボード" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "グループ名" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "次回から自動的にサインイン" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "ファイルに名前をつける..." + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "アバターを変更できます : " + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "メールアドレス:" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "メールアドレスがありません。更新してください。" + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "%s リポジトリグループダッシュボード" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "再スキャンオプション" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "Web" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "VCSの操作にSSLを必須とする" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "" +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "プッシュ、プル時にSSLを要求します。SSLでない場合はHTTP Error 406: Not Acceptableを返します。" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "Gravatorsを利用する" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +#, fuzzy +#| msgid "" "Schema of clone URL construction eg. +#| '{scheme}://{user}@{netloc}/{repo}'." "\n" " +#| The following " "variables are available:\n" " +#| {scheme} 'http' " "or 'https' sent from running Kallithea server,\n" " +#| {user} current " "user username,\n" " +#| {netloc} network " "location/server host of running Kallithea server,\n" " +#| {repo} full " "repository name,\n" " +#| {repoid} ID of " "repository, can be used to contruct clone-by-id" +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." +"\n" +" The following " +"variables are available:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" +"クローン URL のスキーマは、 '{scheme}://{user}@{netloc}/{repo}' " +"のような形式にします。使える変数は下記の通りです:\n" +" {scheme} " +"Kallithea サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n" +" {user} " +"現在のユーザーのユーザー名\n" +" {netloc} " +"Kallithea サーバーのアドレスまたはホスト名\n" +" {repo} " +"リポジトリの完全な名前\n" +" {repoid} リポジトリの " +"ID。 clone-by-id に使います。" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "ダッシュボードの項目" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "" +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "メインページダッシュボードで1ページに表示する要素数。" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "管理ページの項目" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "クイックフィルタ..." + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "アバターを変更:" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "メールアドレスがありません。このユーザーのメールアドレスを更新してください。" + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "キーボードショートカット" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "サイト全体" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "パスワードを忘れた?" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "祖先" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "共通の祖先が見つかりません - リポジトリ同士に関連がありません" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "%sから%sのチェンジセット%sに対するコメント" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "チェンジセットを次に変更" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "これは自動的に送信される通知です。このメールに返信しないでください。" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "%sさんが%sへのプルリクエスト \"%s\"でメンションしました" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "%sさんが%sへのプルリクエスト \"%s\"でレビューを要求しています" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "%sから%sのプルリクエスト \"%s\"に対するコメント" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +#, fuzzy +msgid "The comment closed the pull request with status" +msgstr "%s がプルリクエスト\"%s\" にコメントしました" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +#, fuzzy +msgid "The comment was made with status" +msgstr "プルリクエストを以下のステータスで閉じました：" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "このユーザを閲覧する" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "ブランチ:%s で編集" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" +msgstr "リポジトリサイズ" #~ msgid "No comments." #~ msgstr "%d 個のコメント" @@ -6241,3 +7100,194 @@ #~ msgid "New file mode" #~ msgstr "ファイルモード" +#~ msgid "Missing changesets since the previous pull request:" +#~ msgstr "" + +#~ msgid "New changesets on %s %s since the previous pull request:" +#~ msgstr "" + +#~ msgid "Ancestor didn't change - show diff since previous version:" +#~ msgstr "" + +#~ msgid "" +#~ "This pull request is based on " +#~ "another %s revision and there is " +#~ "no simple diff." +#~ msgstr "" + +#~ msgid "No changes found on %s %s since previous version." +#~ msgstr "" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "%s で置き換えられたのでクローズします。" + +#~ msgid "The following changes are available on %s:" +#~ msgstr "" + +#~ msgid "Closing." +#~ msgstr "クローズ。" + +#~ msgid "Repository no access" +#~ msgstr "リポジトリへのアクセス権限無し" + +#~ msgid "Repository read access" +#~ msgstr "リポジトリに読込権限でアクセス" + +#~ msgid "Repository write access" +#~ msgstr "リポジトリに書込権限でアクセス" + +#~ msgid "Repository admin access" +#~ msgstr "リポジトリに管理権限でアクセス" + +#~ msgid "Repository Group no access" +#~ msgstr "リポジトリグループへのアクセス権限なし" + +#~ msgid "Repository Group read access" +#~ msgstr "リポジトリグループに読込権限でアクセス" + +#~ msgid "Repository Group write access" +#~ msgstr "リポジトリグループに書込権限でアクセス" + +#~ msgid "Repository Group admin access" +#~ msgstr "リポジトリグループに管理権限でアクセス" + +#~ msgid "Repository creation disabled" +#~ msgstr "リポジトリの作成を有効にする" + +#~ msgid "Repository creation enabled" +#~ msgstr "リポジトリの作成を有効にする" + +#~ msgid "Repository forking disabled" +#~ msgstr "リポジトリのフォークを無効にする" + +#~ msgid "Repository forking enabled" +#~ msgstr "リポジトリのフォークを有効にする" + +#~ msgid "Register disabled" +#~ msgstr "新規登録を無効にする" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "Kallitheaに登録した新しいユーザーを手動でアクティベートする" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "Kallitheaに登録した新しいユーザーを自動でアクティベートする" + +#~ msgid "Not Reviewed" +#~ msgstr "未レビュー" + +#~ msgid "Rejected" +#~ msgstr "却下" + +#~ msgid "Under Review" +#~ msgstr "レビュー中" + +#~ msgid "Repository group no access" +#~ msgstr "リポジトリグループへのアクセス権限なし" + +#~ msgid "Repository group read access" +#~ msgstr "リポジトリグループに読込権限でアクセス" + +#~ msgid "Repository group write access" +#~ msgstr "リポジトリグループに書込権限でアクセス" + +#~ msgid "Repository group admin access" +#~ msgstr "リポジトリグループに管理権限でアクセス" + +#~ msgid "User group no access" +#~ msgstr "ユーザーグループへのアクセス権限なし" + +#~ msgid "User group read access" +#~ msgstr "ユーザーグループに読込権限でアクセス" + +#~ msgid "User group write access" +#~ msgstr "ユーザーグループに書込権限でアクセス" + +#~ msgid "User group admin access" +#~ msgstr "ユーザーグループに管理権限でアクセス" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "リポジトリグループの作成を無効にする" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "リポジトリグループの作成を有効にする" + +#~ msgid "User Group creation disabled" +#~ msgstr "ユーザーグループの作成を無効にする" + +#~ msgid "User Group creation enabled" +#~ msgstr "ユーザーグループの作成を有効にする" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" + +#~ msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "%(user)s がプリリクエスト #%(pr_id)s: %(pr_title)s のレビューを求めています" + +#~ msgid "repositories" +#~ msgstr "リポジトリ" + +#~ msgid "No repositories found." +#~ msgstr "リポジトリが見つかりません。" + +#~ msgid "There are no branches yet" +#~ msgstr "まだブランチがありません" + +#~ msgid "There are no tags yet" +#~ msgstr "まだタグがありません" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "まだブックマークがありません" + +#~ msgid "Analytics HTML block" +#~ msgstr "" + +#~ msgid "" +#~ "HTML with JavaScript for web analytics" +#~ " systems like Google Analytics or " +#~ "Piwik. This will be added at the" +#~ " bottom of every page." +#~ msgstr "" + +#~ msgid "enabled" +#~ msgstr "有効" + +#~ msgid "%s Bookmarks" +#~ msgstr "%s ブックマーク" + +#~ msgid "Compare Bookmarks" +#~ msgstr "ブックマークを比較" + +#~ msgid "%s Branches" +#~ msgstr "%s ブランチ" + +#~ msgid "Compare Branches" +#~ msgstr "ブランチを比較" + +#~ msgid "Editing file" +#~ msgstr "ファイルを編集" + +#~ msgid "Update" +#~ msgstr "更新" + +#~ msgid "" +#~ "Pull requests do not change once " +#~ "created. Select a revision and save " +#~ "to replace this pull request with " +#~ "a new one." +#~ msgstr "" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "新しいプルリクエストとして保存" + +#~ msgid "%s Tags" +#~ msgstr "%s タグ" + +#~ msgid "Compare Tags" +#~ msgstr "タグを比較" + diff -r a48802bf7134 -r 880e2f07651b kallithea/i18n/kallithea.pot --- a/kallithea/i18n/kallithea.pot Thu Jul 27 03:02:37 2017 +0200 +++ b/kallithea/i18n/kallithea.pot Thu Jul 27 14:26:14 2017 +0200 @@ -1,14 +1,14 @@ # Translations template for Kallithea. -# Copyright (C) 2016 Various authors, licensing as GPLv3 +# Copyright (C) 2017 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. -# FIRST AUTHOR , 2016. +# FIRST AUTHOR , 2017. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3.99\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2016-03-14 16:51+0100\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,441 +16,475 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: kallithea/controllers/changelog.py:85 -#: kallithea/controllers/pullrequests.py:240 kallithea/lib/base.py:515 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:198 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "" -#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 msgid "Ignore whitespace" msgstr "" -#: kallithea/controllers/changeset.py:168 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:744 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, python-format +msgid "Could not find other repository %s" +msgstr "" + +#: kallithea/controllers/compare.py:73 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "" +#: kallithea/controllers/error.py:70 +msgid "No response" +msgstr "" + #: kallithea/controllers/error.py:71 -msgid "No response" -msgstr "" - -#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "The server encountered an unexpected condition which prevented it from fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:55 +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 +#: kallithea/templates/changeset/changeset.html:195 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: kallithea/controllers/feed.py:84 +#, python-format +msgid "%s committed on %s" +msgstr "" + +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 +#, python-format +msgid "%s %s feed" +msgstr "" + +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 #, python-format msgid "Changes on %s repository" msgstr "" -#: kallithea/controllers/feed.py:56 -#, python-format -msgid "%s %s feed" -msgstr "" - -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 -msgid "Changeset was too big and was cut off..." -msgstr "" - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "" - -#: kallithea/controllers/files.py:92 -msgid "Click here to add new file" -msgstr "" - #: kallithea/controllers/files.py:93 +msgid "Click here to add new file" +msgstr "" + +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:195 +#: kallithea/controllers/files.py:191 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:307 kallithea/controllers/files.py:367 -#: kallithea/controllers/files.py:434 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:319 +#: kallithea/controllers/files.py:309 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:330 +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:352 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:356 kallithea/controllers/files.py:422 -#: kallithea/controllers/files.py:503 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:379 +#: kallithea/controllers/files.py:369 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:393 +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:409 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:418 kallithea/controllers/files.py:492 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:445 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:466 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:470 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "" +#: kallithea/controllers/files.py:517 +msgid "Downloads disabled" +msgstr "" + #: kallithea/controllers/files.py:528 -msgid "Downloads disabled" -msgstr "" - -#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "" -#: kallithea/controllers/files.py:543 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:773 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:94 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:479 -#: kallithea/templates/base/base.html:653 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "" -#: kallithea/controllers/home.py:151 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:157 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:306 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:150 +#: kallithea/controllers/login.py:148 +#, python-format msgid "You have successfully registered with %s" msgstr "" -#: kallithea/controllers/login.py:195 +#: kallithea/controllers/login.py:193 msgid "A password reset confirmation code has been sent" msgstr "" -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:242 msgid "Invalid password reset token" msgstr "" -#: kallithea/controllers/login.py:249 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:123 +#: kallithea/controllers/pullrequests.py:73 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:135 #, python-format msgid "%s (closed)" msgstr "" -#: kallithea/controllers/pullrequests.py:151 +#: kallithea/controllers/pullrequests.py:162 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:183 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:184 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:312 +#: kallithea/controllers/pullrequests.py:326 #, python-format msgid "Error creating pull request: %s" msgstr "" +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 +msgid "Error occurred while creating pull request" +msgstr "" + #: kallithea/controllers/pullrequests.py:358 -#: kallithea/controllers/pullrequests.py:505 -msgid "No description" -msgstr "" - -#: kallithea/controllers/pullrequests.py:365 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:368 -#: kallithea/controllers/pullrequests.py:455 -#: kallithea/controllers/pullrequests.py:512 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:371 -#: kallithea/controllers/pullrequests.py:458 -msgid "Error occurred while creating pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:403 -msgid "Missing changesets since the previous pull request:" +#: kallithea/controllers/pullrequests.py:381 +msgid "New pull request iteration created" msgstr "" #: kallithea/controllers/pullrequests.py:410 #, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:417 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "This pull request is based on another %s revision and there is no simple diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:426 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:464 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:472 -msgid "Pull request update created" -msgstr "" - -#: kallithea/controllers/pullrequests.py:516 +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:414 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "" + +#: kallithea/controllers/pullrequests.py:439 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:531 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:491 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:599 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:617 -#, python-format -msgid "The following changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:621 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:629 +#: kallithea/controllers/pullrequests.py:552 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:556 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:635 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:571 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:573 +#, python-format +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:738 +#: kallithea/controllers/pullrequests.py:676 #, python-format msgid "Successfully deleted pull request %s" msgstr "" -#: kallithea/controllers/pullrequests.py:748 -msgid "Closing." -msgstr "" - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "" -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "" -#: kallithea/controllers/summary.py:181 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:184 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "" @@ -462,149 +496,153 @@ msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 msgid "Forever" msgstr "" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:290 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:200 msgid "Unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:201 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:324 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" msgstr "" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -612,1883 +650,1559 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:336 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:344 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1705 -msgid "Manual activation of external account" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1706 -msgid "Automatic activation of external account" -msgstr "" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:187 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:192 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:249 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "" +#: kallithea/controllers/admin/repo_groups.py:248 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:258 +#, python-format +msgid "This group contains %s repositories and cannot be deleted" +msgstr "" + #: kallithea/controllers/admin/repo_groups.py:265 #, python-format -msgid "Error occurred during update of repository group %s" -msgstr "" - -#: kallithea/controllers/admin/repo_groups.py:283 -#, python-format -msgid "This group contains %s repositories and cannot be deleted" -msgstr "" - -#: kallithea/controllers/admin/repo_groups.py:290 -#, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:296 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:301 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:404 -#: kallithea/controllers/admin/repo_groups.py:439 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:456 -#: kallithea/controllers/admin/repos.py:397 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:151 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:212 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:221 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:224 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:261 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:309 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:312 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:317 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:320 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:325 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:373 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:429 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:443 +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, python-format +msgid "An error occurred during creation of field: %r" +msgstr "" + +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:459 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:490 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:511 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "" -#: kallithea/controllers/admin/repos.py:513 +#: kallithea/controllers/admin/repos.py:473 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:480 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:536 -#: kallithea/controllers/admin/repos.py:563 +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 msgid "Repository has been locked" msgstr "" -#: kallithea/controllers/admin/repos.py:539 -#: kallithea/controllers/admin/repos.py:560 +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 msgid "Repository has been unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:542 -#: kallithea/controllers/admin/repos.py:567 +#: kallithea/controllers/admin/repos.py:502 +#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:533 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:585 +#: kallithea/controllers/admin/repos.py:537 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:603 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:636 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "" +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 +msgid "Unable to activate hgsubversion support. The \"hgsubversion\" library is missing" +msgstr "" + #: kallithea/controllers/admin/settings.py:145 -msgid "Unable to activate hgsubversion support. The \"hgsubversion\" library is missing" -msgstr "" - -#: kallithea/controllers/admin/settings.py:151 -#: kallithea/controllers/admin/settings.py:248 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:187 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:244 +#: kallithea/controllers/admin/settings.py:189 +#, python-format +msgid "Invalidated %s repositories" +msgstr "" + +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:301 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:306 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:347 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:378 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:392 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:396 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:208 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:219 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:224 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:242 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:217 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:222 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:235 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:462 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:468 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:482 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:737 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:750 +#: kallithea/lib/auth.py:829 +msgid "You need to be a registered user to perform this action" +msgstr "" + +#: kallithea/lib/auth.py:857 +msgid "You need to be signed in to view this page" +msgstr "" + +#: kallithea/lib/base.py:449 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:768 +#: kallithea/lib/base.py:508 msgid "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/auth.py:813 -msgid "You need to be a registered user to perform this action" -msgstr "" - -#: kallithea/lib/auth.py:843 -msgid "You need to be signed in to view this page" -msgstr "" - -#: kallithea/lib/base.py:493 +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:623 -msgid "Changeset not found" -msgstr "" - -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/base.py:617 +#, python-format +msgid "Changeset for %s %s not found in %s" +msgstr "" + +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:613 +#, python-format +msgid "Changeset %s not found" +msgstr "" + +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1128 -#: kallithea/templates/compare/compare_diff.html:71 -#: kallithea/templates/pullrequests/pullrequest_show.html:337 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1469 +#: kallithea/lib/helpers.py:1230 #, python-format msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories" msgstr "" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:435 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:437 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:439 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:455 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:457 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:459 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:462 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:465 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1669 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2237 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2238 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1518 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1701 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1695 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1696 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1715 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1717 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 +#: kallithea/model/db.py:1718 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1719 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1720 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1722 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 +#: kallithea/model/db.py:1723 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1724 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1725 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1727 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1728 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1729 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1730 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1732 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1733 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1735 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1736 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1692 +#: kallithea/model/db.py:1738 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1693 +#: kallithea/model/db.py:1739 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1741 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1742 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1744 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1745 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1702 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1748 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1749 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2236 +#: kallithea/model/db.py:2276 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2239 +#: kallithea/model/db.py:2277 msgid "Under review" msgstr "" -#: kallithea/model/forms.py:57 -msgid "Please enter a login" +#: kallithea/model/db.py:2278 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2279 +msgid "Approved" msgstr "" #: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 -msgid "Please enter a password" -msgstr "" - #: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:165 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "" +#: kallithea/model/notification.py:240 +#, python-format +msgid "%(user)s commented on changeset %(age)s" +msgstr "" + +#: kallithea/model/notification.py:241 +#, python-format +msgid "%(user)s sent message %(age)s" +msgstr "" + +#: kallithea/model/notification.py:242 +#, python-format +msgid "%(user)s mentioned you %(age)s" +msgstr "" + +#: kallithea/model/notification.py:243 +#, python-format +msgid "%(user)s registered in Kallithea %(age)s" +msgstr "" + +#: kallithea/model/notification.py:244 +#, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:245 +#, python-format +msgid "%(user)s commented on pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:252 +#, python-format +msgid "%(user)s commented on changeset at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:253 +#, python-format +msgid "%(user)s sent message at %(when)s" +msgstr "" + #: kallithea/model/notification.py:254 #, python-format -msgid "%(user)s commented on changeset %(age)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:255 #, python-format -msgid "%(user)s sent message %(age)s" +msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" #: kallithea/model/notification.py:256 #, python-format -msgid "%(user)s mentioned you %(age)s" +msgid "%(user)s opened new pull request at %(when)s" msgstr "" #: kallithea/model/notification.py:257 #, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:266 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:302 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:288 +#, python-format +msgid "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on %(branch)s" +msgstr "" + +#: kallithea/model/notification.py:291 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:293 +#, python-format +msgid "[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from %(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from %(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:307 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:321 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:708 +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "Cannot create pull request - criss cross merge detected, please merge a later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "This iteration is based on another %s revision and there is no simple diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "User \"%s\" still owns %s repositories and cannot be removed. Switch owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "User \"%s\" still owns %s repository groups and cannot be removed. Switch owners or remove those repository groups: %s" msgstr "" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "User \"%s\" still owns %s user groups and cannot be removed. Switch owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:368 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:418 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:419 +#: kallithea/model/user.py:414 #, python-format msgid "The password to your account %s has been changed using password reset form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:96 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:98 +#: kallithea/model/validators.py:75 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:100 +#: kallithea/model/validators.py:77 msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with an alphanumeric character or underscore" msgstr "" -#: kallithea/model/validators.py:127 +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:111 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + +#: kallithea/model/validators.py:131 +msgid "Invalid user group name" +msgstr "" + +#: kallithea/model/validators.py:132 +#, python-format +msgid "User group \"%(usergroup)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:134 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:154 -msgid "Invalid user group name" -msgstr "" - -#: kallithea/model/validators.py:155 -#, python-format -msgid "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:157 msgid "user group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:197 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:198 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:200 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:258 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:273 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:289 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:304 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:335 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "" -#: kallithea/model/validators.py:351 +#: kallithea/model/validators.py:326 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:353 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:354 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:356 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:470 +#: kallithea/model/validators.py:449 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:471 +#: kallithea/model/validators.py:450 msgid "Invalid repository URL. It must be a valid http, https, ssh, svn+http or svn+https URL" msgstr "" -#: kallithea/model/validators.py:496 +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:511 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:513 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:563 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:604 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:697 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:714 +#: kallithea/model/validators.py:692 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:712 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:771 +#: kallithea/model/validators.py:749 msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to \"username\"" msgstr "" -#: kallithea/model/validators.py:783 +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:784 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:831 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:847 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +msgid "Repository Group" +msgstr "" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:132 +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:244 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:414 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 #, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 msgid "Reset Your Password" msgstr "" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 msgid "Send Password Reset Email" msgstr "" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 msgid "A password reset link will be sent to the specified email address if it is registered in the system." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:19 -#, python-format -msgid "You are about to set a new password for the email address %s." -msgstr "" - #: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 msgid "Note that you must use the same browser session for this as the one used to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 msgid "New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 msgid "Confirm New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 msgid "Admin Journal" msgstr "" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2496,144 +2210,172 @@ msgstr[1] "" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 msgid "Comma-separated list of plugins; Kallithea will try user authentication in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 msgid "Repository Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "" +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 +msgid "Private repositories are only visible to people explicitly added as collaborators." +msgstr "" + #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 -msgid "Private repository" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 -msgid "Private repositories are only visible to people explicitly added as collaborators." +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 +msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 +msgid "Enable download menu on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 +msgid "Enable locking" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:61 #: kallithea/templates/admin/repos/repo_edit_settings.html:84 -msgid "Enable statistics" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 -msgid "Enable statistics window on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 -msgid "Enable downloads" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 -msgid "Enable download menu on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2642,314 +2384,467 @@ msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "Gist was update since you started editing. Copy your changes and click %(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 msgid "Never" msgstr "" +#: kallithea/templates/admin/gists/edit.html:145 +msgid "Update Gist" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:146 -msgid "Update Gist" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:147 -#: kallithea/templates/changeset/changeset_file_comment.html:105 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, python-format msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, python-format msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:31 -#: kallithea/templates/changeset/changeset_file_comment.html:95 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:431 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 msgid "Owned Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 msgid "Watched Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 msgid "Show Permissions" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, python-format msgid "Confirm to reset this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, python-format msgid "Confirm to remove this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 msgid "Remove" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "" @@ -2957,263 +2852,343 @@ msgid "Change Your Account Password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 msgid "Repositories You Own" msgstr "" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 msgid "Repositories You are Watching" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 msgid "Mark All Read" msgstr "" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +msgid "Mark as read" +msgstr "" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 msgid "Show Notification" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:430 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 msgid "Default Permissions" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 #, python-format msgid "Allow access to Kallithea without needing to log in. Anonymous users use %s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 msgid "All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 +msgid "Apply to all existing repositories" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 +msgid "Permissions for the Default user on new repositories." +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:26 -msgid "Apply to all existing repositories" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:27 -msgid "Permissions for the Default user on new repositories." +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 +msgid "Repository group" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 +msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 +msgid "Apply to all existing repository groups" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 +msgid "Permissions for the Default user on new repository groups." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:39 -msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:40 -msgid "Apply to all existing repository groups" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:41 -msgid "Permissions for the Default user on new repository groups." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 +msgid "Permissions for the Default user on new user groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 +msgid "Top level repository creation" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:55 -msgid "Permissions for the Default user on new user groups." +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 +msgid "Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 +msgid "Note: This will also give all users API access to create repositories everywhere. That might change in future versions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:60 -msgid "Top level repository creation" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 -msgid "Note: This will also give all users API access to create repositories everywhere. That might change in future versions." +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 +msgid "Repository creation with group write access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 +msgid "With this, write permission to a repository group allows creating repositories inside that group. Without this, group write permissions mean nothing." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 +msgid "User group creation" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:70 -msgid "Repository creation with group write access" +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 +msgid "Enable this to allow non-admins to create user groups." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:74 -msgid "With this, write permission to a repository group allows creating repositories inside that group. Without this, group write permissions mean nothing." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:79 -msgid "User group creation" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:83 -msgid "Enable this to allow non-admins to create user groups." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, python-format msgid "Confirm to delete this IP address: %s" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "" @@ -3222,31 +3197,42 @@ msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "" @@ -3270,12 +3256,14 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3286,16 +3274,32 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +msgid "Add repos" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3303,95 +3307,106 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "Set or revoke permission to all children of that group, including non-private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format -msgid "%s Repository group dashboard" +msgid "Repository group %s" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 msgid "Repository Groups Administration" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 msgid "Optional: URL of a remote repository. If set, the repository will be created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 msgid "Default revision for files page, downloads, full text search index and readme generation" msgstr "" @@ -3414,118 +3429,146 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 msgid "Parent" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 msgid "Public Journal Visibility" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 msgid "Add to Public Journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 msgid "All actions done in this repository will be visible to everyone in the public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 msgid "Change Locking" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 +msgid "Unlock Repository" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 -msgid "Unlock Repository" +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 +#, python-format +msgid "Locked by %s on %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, python-format -msgid "Locked by %s on %s" +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 +msgid "Lock Repository" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 msgid "Force locking on the repository. Works only when anonymous access is disabled. Triggering a pull locks the repository. The user who is pulling locks the repository; only the user who pulled and locked it can unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 msgid "Delete this Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 msgid "The deleted repository will be moved away and hidden until the administrator expires it. The administrator can both permanently delete it or restore it." msgstr "" @@ -3533,130 +3576,138 @@ msgid "Invalidate Repository Cache" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "Manually invalidate cache for this repository. On first access, the repository will be cached again." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 msgid "Private Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +msgid "Fork of repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 msgid "Remote repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 -msgid "Confirm to pull changes from remote repository." -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the repository URL changes.\n" " Using the above permanent URL guarantees that this repository always will be accessible on that URL.\n" " This is useful for CI systems, or any other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "Optional: URL of a remote repository. If set, the repository can be pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3669,289 +3720,346 @@ msgstr "" #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 msgid "Repositories Administration" msgstr "" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 msgid "Settings Administration" msgstr "" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 -msgid "HTML with JavaScript for web analytics systems like Google Analytics or Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 +msgid "HTML (possibly with JavaScript and/or CSS) that will be added to the bottom of every page. This can be used for web analytics systems like Google Analytics or Piwik, but also to perform instance-specific customizations like adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 msgid "Private key for reCaptcha system. Setting this value will enable captcha on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 msgid "Save Settings" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 msgid "Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 msgid "Check this option to remove all comments, pull requests and other records related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "Verify if Kallithea's Git hooks are installed for each repository. Current hooks will be updated to the latest version." +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 +msgid "Verify if Kallithea's Git hooks are installed for each repository. Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 -msgid "If installing Git hooks, overwrite any existing hooks, even if they do not seem to come from Kallithea. WARNING: This operation will destroy any custom git hooks you may have deployed by hand!" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 +msgid "If installing Git hooks, overwrite any existing hooks, even if they do not seem to come from Kallithea. WARNING: This operation will destroy any custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 msgid "This option completely reindexeses all of the repositories for proper fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Kallithea version" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:10 -msgid "Upgrade info endpoint" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 +msgid "Upgrade info endpoint" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "Activate to require SSL both pushing and pulling. If SSL certificate is missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 msgid "Mercurial extensions" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 +msgid "Enable hgsubversion extension" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:47 -msgid "Enable largefiles extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:51 -msgid "Enable hgsubversion extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 msgid "Requires hgsubversion library to be installed. Enables cloning of remote Subversion repositories while converting them to Mercurial." msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 +msgid "Location of repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Location of repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 msgid "Click to unlock. You must restart Kallithea in order to make this setting take effect." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 msgid "Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following variables of the URL will be replaced accordingly.\n" @@ -3962,88 +4070,110 @@ " {netloc} network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.\n" -" The following variables are available:\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {user} current user username,\n" -" {netloc} network location/server host of running Kallithea server,\n" -" {repo} full repository name,\n" -" {repoid} ID of repository, can be used to construct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 -msgid "Number of items displayed in the main page dashboard before pagination is shown." +" The following variables are available:\n" +" {scheme} 'http' or 'https' sent from running Kallithea server,\n" +" {user} current user username,\n" +" {netloc} network location/server host of running Kallithea server,\n" +" {repo} full repository name,\n" +" {repoid} ID of repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +msgid "Repository page size" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:57 +msgid "Number of items displayed in the repository pages before pagination is shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 msgid "Number of items displayed in the admin pages grids before pagination is shown." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 +msgid "Icons" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:75 -msgid "Icons" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:97 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 +msgid "Parses meta tags from the repository description field and turns them into colored tags." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:111 -msgid "Parses meta tags from the repository description field and turns them into colored tags." -msgstr "" - #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 msgid "Show Members" msgstr "" @@ -4053,13 +4183,15 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4068,48 +4200,59 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 msgid "User Groups Administration" msgstr "" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "" @@ -4119,12 +4262,14 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "" @@ -4133,7 +4278,8 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4142,710 +4288,873 @@ msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 msgid "Users Administration" msgstr "" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:142 -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:147 +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:154 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:331 +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:155 +#: kallithea/tests/data/templates/base/base.html.py:399 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:157 +#: kallithea/tests/data/templates/base/base.html.py:405 msgid "Lock" msgstr "" +#: kallithea/templates/base/base.html:165 +#: kallithea/tests/data/templates/base/base.html.py:413 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 +msgid "Fork" +msgstr "" + #: kallithea/templates/base/base.html:170 -msgid "Follow" -msgstr "" - -#: kallithea/templates/base/base.html:171 -msgid "Unfollow" -msgstr "" - -#: kallithea/templates/base/base.html:174 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 +msgid "Create Pull Request" msgstr "" #: kallithea/templates/base/base.html:175 -#: kallithea/templates/pullrequests/pullrequest.html:88 -msgid "Create Pull Request" -msgstr "" - -#: kallithea/templates/base/base.html:180 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:485 +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:305 +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "" +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 +msgid "Gists" +msgstr "" + #: kallithea/templates/base/base.html:311 -#: kallithea/templates/base/base.html:312 -msgid "Public journal" -msgstr "" - -#: kallithea/templates/base/base.html:317 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:318 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:322 +#: kallithea/tests/data/templates/base/base.html.py:525 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:330 +#: kallithea/templates/base/base.html:319 +#: kallithea/tests/data/templates/base/base.html.py:540 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:353 -#: kallithea/templates/base/base.html:354 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:377 +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:384 +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 msgid "Login to Your Account" msgstr "" +#: kallithea/templates/base/base.html:385 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:389 +msgid "Don't have an account?" +msgstr "" + #: kallithea/templates/base/base.html:407 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:434 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:615 -msgid "Keyboard shortcuts" -msgstr "" - -#: kallithea/templates/base/base.html:624 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 msgid "Inherit defaults" msgstr "" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 #, python-format msgid "Select to inherit global settings, IP whitelist and permissions from the %s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -msgid "Add Another Comment" -msgstr "" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - #: kallithea/templates/base/root.html:25 -msgid "Group" +#: kallithea/tests/data/templates/base/root.html.py:85 +msgid "Add Another Comment" msgstr "" #: kallithea/templates/base/root.html:26 -msgid "members" +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:27 -msgid "Loading ..." +#: kallithea/tests/data/templates/base/root.html.py:89 +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:28 -msgid "loading ..." +#: kallithea/tests/data/templates/base/root.html.py:91 +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/tests/data/templates/base/root.html.py:93 +msgid "members" msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" +#: kallithea/tests/data/templates/base/root.html.py:95 +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:31 -msgid "Open New Pull Request from {0}" +#: kallithea/tests/data/templates/base/root.html.py:97 +msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" +#: kallithea/tests/data/templates/base/root.html.py:99 +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets {0} → {1}" +#: kallithea/tests/data/templates/base/root.html.py:101 +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" +#: kallithea/tests/data/templates/base/root.html.py:103 +msgid "Open New Pull Request from {0}" msgstr "" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -#: kallithea/templates/changeset/diff_block.html:21 -msgid "Collapse Diff" +#: kallithea/tests/data/templates/base/root.html.py:105 +msgid "Open New Pull Request for {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:36 -msgid "Expand Diff" +#: kallithea/tests/data/templates/base/root.html.py:107 +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" +#: kallithea/tests/data/templates/base/root.html.py:109 +msgid "Selection Link" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 +msgid "Collapse Diff" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" +#: kallithea/tests/data/templates/base/root.html.py:113 +msgid "Expand Diff" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/base/root.html.py:115 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 msgid "Specify changeset" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." msgstr "" #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 msgid "Go to tip of repository" msgstr "" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 #, python-format msgid "" "Changeset status: %s by %s\n" "Click to open associated pull request %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/changelog/changelog_summary_data.html:24 +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 #, python-format msgid "Changeset status: %s by %s" msgstr "" +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 +msgid "Expand commit message" +msgstr "" + #: kallithea/templates/changelog/changelog.html:116 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:125 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:57 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:141 -#: kallithea/templates/changelog/changelog_summary_data.html:63 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#: kallithea/templates/compare/compare_cs.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:203 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:146 -#: kallithea/templates/changelog/changelog_summary_data.html:68 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:311 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:47 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:87 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:93 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 msgid "Push new repository" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:101 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:39 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:75 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 msgid "Merge" msgstr "" +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 +msgid "Grafted from:" +msgstr "" + #: kallithea/templates/changeset/changeset.html:123 -msgid "Grafted from:" +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 +msgid "Transplanted from:" msgstr "" #: kallithea/templates/changeset/changeset.html:129 -msgid "Transplanted from:" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:329 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:62 -#: kallithea/templates/pullrequests/pullrequest_show.html:331 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:231 -#: kallithea/templates/changeset/changeset.html:268 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 msgid "No revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 msgid "on pull request" msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 +msgid "No title" +msgstr "" + #: kallithea/templates/changeset/changeset_file_comment.html:22 -msgid "No title" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 msgid "on this changeset" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 msgid "Delete comment?" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 msgid "Status change" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:59 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 msgid "Commenting on line." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:60 +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 msgid "Comments are in plain text. Use @username inside this text to notify another user." msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 +msgid "Set changeset status" +msgstr "" + #: kallithea/templates/changeset/changeset_file_comment.html:67 -msgid "Set changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:69 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:75 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 msgid "No change" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 msgid "Finish pull request" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 msgid "Close" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 msgid "Submitting ..." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:104 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:116 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:129 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:130 +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 #, python-format msgid "%d general" msgid_plural "%d general" @@ -4853,215 +5162,318 @@ msgstr[1] "" #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +msgid "Modified" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 msgid "Deleted" msgstr "" -#: kallithea/templates/changeset/diff_block.html:57 +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 msgid "Renamed" msgstr "" -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:48 +#, python-format +msgid "Unknown operation: %r" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:52 +msgid "No file after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:69 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:83 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "" #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "Please merge the target branch to your branch before creating a pull request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:85 +#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:321 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:99 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:107 +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:108 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, python-format msgid "%s changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:109 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 msgid "behind" msgstr "" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "" #: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "" #: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +msgid "Changeset on" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +msgid "branch" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +msgid "Status change:" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:33 +msgid "The pull request has been closed." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 -msgid "We have received a request to reset the password for your account." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:8 -msgid "This account is however managed outside this system and the password cannot be changed here." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:10 -msgid "To set a new password, click the following link" -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:13 -msgid "Should you not be able to use the link above, please type the following code into the password reset form" -msgstr "" - #: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 +msgid "We have received a request to reset the password for your account." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 +msgid "This account is however managed outside this system and the password cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 +msgid "To set a new password, click the following link" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 +msgid "Should you not be able to use the link above, please type the following code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 msgid "If it weren't you who requested the password reset, just disregard this message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +msgid "Pull request from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +msgid "at" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" msgstr "" #: kallithea/templates/files/diff_2way.html:15 @@ -5080,82 +5492,104 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 +#: kallithea/tests/data/templates/files/files_add.html.py:241 msgid "New file type" msgstr "" -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 msgid "Commit Changes" msgstr "" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:62 -msgid "Last Revision" -msgstr "" - #: kallithea/templates/files/files_browser.html:63 -msgid "Last Modified" +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 +msgid "Size" msgstr "" #: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 msgid "Last Committer" msgstr "" @@ -5165,7 +5599,7 @@ msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5178,109 +5612,128 @@ msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "" -#: kallithea/templates/files/files_source.html:74 +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 msgid "File is too big to display." msgstr "" -#: kallithea/templates/files/files_source.html:76 +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 msgid "Show full annotation anyway." msgstr "" -#: kallithea/templates/files/files_source.html:78 +#: kallithea/templates/files/files_source.html:73 +#: kallithea/tests/data/templates/files/files_source.html.py:133 msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "" @@ -5289,70 +5742,80 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 -msgid "ATOM journal feed" -msgstr "" - #: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "" @@ -5366,34 +5829,45 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "" @@ -5428,7 +5902,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "" @@ -5446,113 +5922,146 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, python-format msgid "%s Pull Request %s" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, python-format msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 msgid "There are no reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 msgid "on" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 msgid "This is just a range of changesets and doesn't have a target or a real merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:215 -msgid "Pull requests do not change once created. Select a revision and save to replace this pull request with a new one." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:224 +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 +msgid "Pull request iterations do not change content once created. Select a revision and save to make a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +msgid "Cancel Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 msgid "Pull Request Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:249 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 msgid "Remove reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:269 +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 msgid "Potential Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:272 +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:295 -msgid "Save Changes" +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 +msgid "Pull Request Content" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:296 -msgid "Save Updates as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:297 -msgid "Cancel Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:307 -msgid "Pull Request Content" +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +msgid "Common ancestor" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 @@ -5570,238 +6079,451 @@ msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 msgid "Search in All Repositories" msgstr "" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "" +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "" + #: kallithea/templates/summary/statistics.html:390 -msgid "commits" +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" msgstr "" #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" +#: kallithea/tests/data/templates/summary/statistics.html.py:153 +msgid "files removed" msgstr "" #: kallithea/templates/summary/statistics.html:393 -msgid "files removed" +#: kallithea/tests/data/templates/summary/statistics.html.py:155 +msgid "commit" +msgstr "" + +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 +msgid "file added" msgstr "" #: kallithea/templates/summary/statistics.html:395 -msgid "commit" +#: kallithea/tests/data/templates/summary/statistics.html.py:159 +msgid "file changed" msgstr "" #: kallithea/templates/summary/statistics.html:396 -msgid "file added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:397 -msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "" +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 +msgid "Show by ID" +msgstr "" + #: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/summary/summary.html.py:143 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "" +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 +msgid "Download" +msgstr "" + +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 +msgid "Downloads are disabled for this repository" +msgstr "" + #: kallithea/templates/summary/summary.html:108 -msgid "Download" +#: kallithea/tests/data/templates/summary/summary.html.py:190 +msgid "Download as zip" msgstr "" #: kallithea/templates/summary/summary.html:112 -msgid "There are no downloads yet" +#: kallithea/tests/data/templates/summary/summary.html.py:194 +msgid "Check this to download archive with subrepos" msgstr "" #: kallithea/templates/summary/summary.html:114 -msgid "Downloads are disabled for this repository" -msgstr "" - -#: kallithea/templates/summary/summary.html:120 -msgid "Download as zip" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 -msgid "Check this to download archive with subrepos" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 +#: kallithea/tests/data/templates/summary/summary.html.py:196 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 msgid "Latest Changes" msgstr "" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "" - +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "Activate to require SSL both pushing and pulling. If SSL certificate is missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.\n" +" The following variables are available:\n" +" {scheme} 'http' or 'https' sent from running Kallithea server,\n" +" {user} current user username,\n" +" {netloc} network location/server host of running Kallithea server,\n" +" {repo} full repository name,\n" +" {repoid} ID of repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "Number of items displayed in the main page dashboard before pagination is shown." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +msgid "The comment was made with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" +msgstr "" + diff -r a48802bf7134 -r 880e2f07651b kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Thu Jul 27 03:02:37 2017 +0200 +++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po Thu Jul 27 14:26:14 2017 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2016-03-14 16:51+0100\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: 2017-06-18 16:22+0000\n" "Last-Translator: Thomas De Schampheleire \n" "Language-Team: Dutch (Belgium) " @@ -19,450 +19,486 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 2.15-dev\n" -#: kallithea/controllers/changelog.py:85 -#: kallithea/controllers/pullrequests.py:240 kallithea/lib/base.py:515 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "Er zijn nog geen changesets" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "Geen" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:198 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "(gesloten)" -#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "Toon witruimtes" -#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 #, fuzzy msgid "Ignore whitespace" msgstr "Negeer witruimtes" -#: kallithea/controllers/changeset.py:168 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Vergroot de diff context tot %(num)s lijnen" -#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:744 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "Deze revisie bestaat niet in deze repository" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "Selecteer een changeset" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, python-format +msgid "Could not find other repository %s" +msgstr "" + +#: kallithea/controllers/compare.py:73 +#, fuzzy +#| msgid "Cannot compare repositories without using common ancestor" +msgid "Cannot compare repositories of different types" +msgstr "" +"Kan geen repositories vergelijken zonder een gemeenschappelijke voorouder" +" te gebruiken" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "" -"Kan geen repositories vergelijken zonder een gemeenschappelijke voorouder te " -"gebruiken" - -#: kallithea/controllers/error.py:71 +"Kan geen repositories vergelijken zonder een gemeenschappelijke voorouder" +" te gebruiken" + +#: kallithea/controllers/error.py:70 msgid "No response" msgstr "Geen antwoord" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "Ongekende fout" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" -"De aanvraag kon niet door de server begrepen worden wegens incorrecte syntax." - -#: kallithea/controllers/error.py:103 +"De aanvraag kon niet door de server begrepen worden wegens incorrecte " +"syntax." + +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Ongeautoriseerde toegang tot resource" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "U hebt geen permissie om deze pagina te bekijken" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "De resource kon niet gevonden worden" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "De server kon de aanvraag niet voldoen wegens een onverwachte toestand." -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "Veranderingen in repository %s" - -#: kallithea/controllers/feed.py:56 +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 +#: kallithea/templates/changeset/changeset.html:195 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 +msgid "Changeset was too big and was cut off..." +msgstr "De changeset was te groot en werd afgekort..." + +#: kallithea/controllers/feed.py:84 +#, python-format +msgid "%s committed on %s" +msgstr "%s committeerde op %s" + +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 #, python-format msgid "%s %s feed" msgstr "%s %s feed" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 -msgid "Changeset was too big and was cut off..." -msgstr "De changeset was te groot en werd afgekort..." - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "%s committeerde op %s" - -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 +#, python-format +msgid "Changes on %s repository" +msgstr "Veranderingen in repository %s" + +#: kallithea/controllers/files.py:93 msgid "Click here to add new file" msgstr "Klik hier om een nieuw bestand toe te voegen" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "Er zijn nog geen bestanden. %s" -#: kallithea/controllers/files.py:195 +#: kallithea/controllers/files.py:191 #, python-format msgid "%s at %s" msgstr "%s op %s" -#: kallithea/controllers/files.py:307 kallithea/controllers/files.py:367 -#: kallithea/controllers/files.py:434 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Deze repository is gelocket door %s op %s" -#: kallithea/controllers/files.py:319 +#: kallithea/controllers/files.py:309 msgid "You can only delete files with revision being a valid branch" -msgstr "" -"Men kan enkel bestanden verwijderen als de revisie een geldige branch is" - -#: kallithea/controllers/files.py:330 +msgstr "Men kan enkel bestanden verwijderen als de revisie een geldige branch is" + +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Bestand %s verwijderd via Kallithea" -#: kallithea/controllers/files.py:352 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "Bestand %s succesvol verwijderd" -#: kallithea/controllers/files.py:356 kallithea/controllers/files.py:422 -#: kallithea/controllers/files.py:503 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "Er trad een fout op tijdens het committeren" -#: kallithea/controllers/files.py:379 +#: kallithea/controllers/files.py:369 msgid "You can only edit files with revision being a valid branch" msgstr "Men kan enkel bestanden wijzigen als de revisie een geldige branch is" -#: kallithea/controllers/files.py:393 +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "Bestand %s gewijzigd via Kallithea" -#: kallithea/controllers/files.py:409 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "Geen wijzigingen" -#: kallithea/controllers/files.py:418 kallithea/controllers/files.py:492 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "Succesvol gecommitteerd naar %s" -#: kallithea/controllers/files.py:445 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "Bestand toegevoegd via Kallithea" -#: kallithea/controllers/files.py:466 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "Geen inhoud" -#: kallithea/controllers/files.py:470 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "Geen bestandsnaam" -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "De locatie moet een relatief pad zijn en mag geen .. bevatten" +#: kallithea/controllers/files.py:517 +msgid "Downloads disabled" +msgstr "Downloads uitgeschakeld" + #: kallithea/controllers/files.py:528 -msgid "Downloads disabled" -msgstr "Downloads uitgeschakeld" - -#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "Ongekende revisie %s" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "Lege repository" -#: kallithea/controllers/files.py:543 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "Ongekende archieftype" -#: kallithea/controllers/files.py:773 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "Changesets" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "Branches" -#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "Tags" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "Er is een fout opgetreden tijdens het forken van de repository %s" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "Groepen" -#: kallithea/controllers/home.py:94 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:479 -#: kallithea/templates/base/base.html:653 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "Repositories" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "Branch" -#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "Gesloten branches" -#: kallithea/controllers/home.py:151 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "Tag" -#: kallithea/controllers/home.py:157 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "Bladwijzer" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "Publiek logboek" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:306 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "Logboek" -#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 msgid "Bad captcha" msgstr "Incorrecte captcha" -#: kallithea/controllers/login.py:150 +#: kallithea/controllers/login.py:148 +#, python-format msgid "You have successfully registered with %s" msgstr "U bent succesvol geregistreerd bij %s" -#: kallithea/controllers/login.py:195 +#: kallithea/controllers/login.py:193 msgid "A password reset confirmation code has been sent" msgstr "Een paswoordherstel bevestigingscode is verzonden" -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:242 msgid "Invalid password reset token" msgstr "Ongeldig paswoordherstel token" -#: kallithea/controllers/login.py:249 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "Paswoord succesvol aangepast" -#: kallithea/controllers/pullrequests.py:123 +#: kallithea/controllers/pullrequests.py:73 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:135 #, fuzzy, python-format msgid "%s (closed)" msgstr "" -#: kallithea/controllers/pullrequests.py:151 +#: kallithea/controllers/pullrequests.py:162 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 msgid "Changeset" msgstr "Changeset" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:183 msgid "Special" msgstr "Bijzonder" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:184 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:312 +#: kallithea/controllers/pullrequests.py:326 #, python-format msgid "Error creating pull request: %s" msgstr "" +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 +msgid "Error occurred while creating pull request" +msgstr "" + #: kallithea/controllers/pullrequests.py:358 -#: kallithea/controllers/pullrequests.py:505 -msgid "No description" -msgstr "" - -#: kallithea/controllers/pullrequests.py:365 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:368 -#: kallithea/controllers/pullrequests.py:455 -#: kallithea/controllers/pullrequests.py:512 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:371 -#: kallithea/controllers/pullrequests.py:458 -msgid "Error occurred while creating pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:403 -msgid "Missing changesets since the previous pull request:" +#: kallithea/controllers/pullrequests.py:381 +msgid "New pull request iteration created" msgstr "" #: kallithea/controllers/pullrequests.py:410 #, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:417 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:426 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:464 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:472 -msgid "Pull request update created" -msgstr "" - -#: kallithea/controllers/pullrequests.py:516 +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:414 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "" + +#: kallithea/controllers/pullrequests.py:439 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:531 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:491 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:599 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:617 -#, python-format -msgid "The following changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:621 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:629 +#: kallithea/controllers/pullrequests.py:552 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:556 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:635 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:571 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:573 +#, python-format +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:738 +#: kallithea/controllers/pullrequests.py:676 #, python-format msgid "Successfully deleted pull request %s" msgstr "" -#: kallithea/controllers/pullrequests.py:748 -msgid "Closing." -msgstr "" - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "" -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "" -#: kallithea/controllers/summary.py:181 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:184 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "" @@ -474,149 +510,153 @@ msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 msgid "Forever" msgstr "" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:290 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:200 msgid "Unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:201 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:324 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" msgstr "" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -624,610 +664,642 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:336 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:344 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1705 -msgid "Manual activation of external account" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1706 -msgid "Automatic activation of external account" -msgstr "" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:187 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:192 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:249 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "" +#: kallithea/controllers/admin/repo_groups.py:248 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:258 +#, python-format +msgid "This group contains %s repositories and cannot be deleted" +msgstr "" + #: kallithea/controllers/admin/repo_groups.py:265 #, python-format -msgid "Error occurred during update of repository group %s" -msgstr "" - -#: kallithea/controllers/admin/repo_groups.py:283 -#, python-format -msgid "This group contains %s repositories and cannot be deleted" -msgstr "" - -#: kallithea/controllers/admin/repo_groups.py:290 -#, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:296 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:301 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:404 -#: kallithea/controllers/admin/repo_groups.py:439 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:456 -#: kallithea/controllers/admin/repos.py:397 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:151 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:212 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:221 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:224 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:261 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:309 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:312 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:317 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:320 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:325 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:373 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:429 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:443 +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, fuzzy, python-format +#| msgid "An error occurred during repository forking %s" +msgid "An error occurred during creation of field: %r" +msgstr "Er is een fout opgetreden tijdens het forken van de repository %s" + +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:459 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:490 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:511 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "" -#: kallithea/controllers/admin/repos.py:513 +#: kallithea/controllers/admin/repos.py:473 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:480 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:536 -#: kallithea/controllers/admin/repos.py:563 +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 #, fuzzy msgid "Repository has been locked" msgstr "" -#: kallithea/controllers/admin/repos.py:539 -#: kallithea/controllers/admin/repos.py:560 +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 #, fuzzy msgid "Repository has been unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:542 -#: kallithea/controllers/admin/repos.py:567 +#: kallithea/controllers/admin/repos.py:502 +#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:533 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:585 +#: kallithea/controllers/admin/repos.py:537 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:603 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:636 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:151 -#: kallithea/controllers/admin/settings.py:248 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:187 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:244 +#: kallithea/controllers/admin/settings.py:189 +#, python-format +msgid "Invalidated %s repositories" +msgstr "" + +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:301 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:306 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:347 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:378 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:392 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:396 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:208 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:219 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:224 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:242 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:217 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:222 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:235 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:462 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:468 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:482 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:737 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:750 +#: kallithea/lib/auth.py:829 +msgid "You need to be a registered user to perform this action" +msgstr "" + +#: kallithea/lib/auth.py:857 +msgid "You need to be signed in to view this page" +msgstr "" + +#: kallithea/lib/base.py:449 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:768 +#: kallithea/lib/base.py:508 msgid "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/auth.py:813 -msgid "You need to be a registered user to perform this action" -msgstr "" - -#: kallithea/lib/auth.py:843 -msgid "You need to be signed in to view this page" -msgstr "" - -#: kallithea/lib/base.py:493 +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:623 -msgid "Changeset not found" -msgstr "" - -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/base.py:617 +#, python-format +msgid "Changeset for %s %s not found in %s" +msgstr "" + +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:613 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "Changeset %s not found" +msgstr "Selecteer de changeset" + +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1128 -#: kallithea/templates/compare/compare_diff.html:71 -#: kallithea/templates/pullrequests/pullrequest_show.html:337 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1469 +#: kallithea/lib/helpers.py:1230 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1235,1301 +1307,959 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:435 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:437 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:439 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:455 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:457 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:459 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:462 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:465 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1669 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2237 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2238 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1518 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1701 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1695 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1696 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1715 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1717 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 +#: kallithea/model/db.py:1718 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1719 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1720 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1722 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 +#: kallithea/model/db.py:1723 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1724 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1725 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1727 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1728 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1729 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1730 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1732 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1733 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1735 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1736 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1692 +#: kallithea/model/db.py:1738 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1693 +#: kallithea/model/db.py:1739 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1741 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1742 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1744 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1745 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1702 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1748 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1749 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2236 +#: kallithea/model/db.py:2276 #, fuzzy msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2239 +#: kallithea/model/db.py:2277 #, fuzzy msgid "Under review" msgstr "" -#: kallithea/model/forms.py:57 -msgid "Please enter a login" +#: kallithea/model/db.py:2278 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2279 +msgid "Approved" msgstr "" #: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 -msgid "Please enter a password" -msgstr "" - #: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:165 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "" +#: kallithea/model/notification.py:240 +#, python-format +msgid "%(user)s commented on changeset %(age)s" +msgstr "" + +#: kallithea/model/notification.py:241 +#, python-format +msgid "%(user)s sent message %(age)s" +msgstr "" + +#: kallithea/model/notification.py:242 +#, python-format +msgid "%(user)s mentioned you %(age)s" +msgstr "" + +#: kallithea/model/notification.py:243 +#, python-format +msgid "%(user)s registered in Kallithea %(age)s" +msgstr "" + +#: kallithea/model/notification.py:244 +#, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:245 +#, python-format +msgid "%(user)s commented on pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:252 +#, python-format +msgid "%(user)s commented on changeset at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:253 +#, python-format +msgid "%(user)s sent message at %(when)s" +msgstr "" + #: kallithea/model/notification.py:254 #, python-format -msgid "%(user)s commented on changeset %(age)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:255 #, python-format -msgid "%(user)s sent message %(age)s" +msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" #: kallithea/model/notification.py:256 #, python-format -msgid "%(user)s mentioned you %(age)s" +msgid "%(user)s opened new pull request at %(when)s" msgstr "" #: kallithea/model/notification.py:257 #, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:266 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:302 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:288 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" + +#: kallithea/model/notification.py:291 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:293 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:307 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:321 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:708 +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" " owners or remove those repository groups: %s" msgstr "" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:368 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:418 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:419 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:96 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:98 +#: kallithea/model/validators.py:75 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:100 +#: kallithea/model/validators.py:77 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" msgstr "" -#: kallithea/model/validators.py:127 +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:111 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + +#: kallithea/model/validators.py:131 +msgid "Invalid user group name" +msgstr "" + +#: kallithea/model/validators.py:132 +#, python-format +msgid "User group \"%(usergroup)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:134 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:154 -msgid "Invalid user group name" -msgstr "" - -#: kallithea/model/validators.py:155 -#, python-format -msgid "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:157 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:197 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:198 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:200 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:258 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:273 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:289 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:304 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:335 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "" -#: kallithea/model/validators.py:351 +#: kallithea/model/validators.py:326 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:353 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:354 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:356 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:470 +#: kallithea/model/validators.py:449 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:471 +#: kallithea/model/validators.py:450 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:496 +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:511 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:513 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:563 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:604 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:697 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:714 +#: kallithea/model/validators.py:692 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:712 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:771 +#: kallithea/model/validators.py:749 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -#: kallithea/model/validators.py:783 +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:784 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:831 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:847 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +#, fuzzy +#| msgid "Empty repository" +msgid "Repository Group" +msgstr "Lege repository" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:132 +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:244 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:414 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 #, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 msgid "Reset Your Password" msgstr "" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 msgid "Send Password Reset Email" msgstr "" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 msgid "New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 msgid "Confirm New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 msgid "Admin Journal" msgstr "" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, fuzzy, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2537,148 +2267,176 @@ msgstr[1] "" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 msgid "Repository Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "" +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 -msgid "Private repository" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 -msgid "" -"Private repositories are only visible to people explicitly added as " -"collaborators." +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 +msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 +msgid "Enable download menu on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 +msgid "Enable locking" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:61 #: kallithea/templates/admin/repos/repo_edit_settings.html:84 -msgid "Enable statistics" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 -msgid "Enable statistics window on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 -msgid "Enable downloads" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 -msgid "Enable download menu on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2687,316 +2445,469 @@ msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 msgid "Never" msgstr "" +#: kallithea/templates/admin/gists/edit.html:145 +msgid "Update Gist" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:146 -msgid "Update Gist" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:147 -#: kallithea/templates/changeset/changeset_file_comment.html:105 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, python-format msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, python-format msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:31 -#: kallithea/templates/changeset/changeset_file_comment.html:95 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:431 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 msgid "Owned Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 msgid "Watched Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 msgid "Show Permissions" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, python-format msgid "Confirm to reset this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, python-format msgid "Confirm to remove this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 msgid "Remove" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "" @@ -3004,279 +2915,359 @@ msgid "Change Your Account Password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 msgid "Repositories You Own" msgstr "" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 msgid "Repositories You are Watching" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 msgid "Mark All Read" msgstr "" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +msgid "Mark as read" +msgstr "" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 msgid "Show Notification" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:430 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 msgid "Default Permissions" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 msgid "Apply to all existing repositories" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 msgid "Permissions for the Default user on new repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 msgid "Repository group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 msgid "Apply to all existing repository groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 +msgid "Permissions for the Default user on new user groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 +msgid "Top level repository creation" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:55 -msgid "Permissions for the Default user on new user groups." +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 +msgid "Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 +msgid "" +"Note: This will also give all users API access to create repositories " +"everywhere. That might change in future versions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:60 -msgid "Top level repository creation" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, fuzzy, python-format msgid "Confirm to delete this IP address: %s" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "" @@ -3285,31 +3276,42 @@ msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "" @@ -3333,12 +3335,14 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3349,16 +3353,34 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "No response" +msgid "Add repos" +msgstr "Geen antwoord" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3366,102 +3388,115 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 #, fuzzy msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" +#, fuzzy, python-format +#| msgid "This repository has %s fork" +#| msgid_plural "This repository has %s forks" +msgid "Repository group %s" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 msgid "Repository Groups Administration" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3490,91 +3525,112 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, fuzzy, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 msgid "Parent" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 msgid "Public Journal Visibility" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 msgid "Add to Public Journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 msgid "Change Locking" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 +msgid "Unlock Repository" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 -msgid "Unlock Repository" +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 +#, python-format +msgid "Locked by %s on %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, python-format -msgid "Locked by %s on %s" +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 +msgid "Lock Repository" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3582,33 +3638,40 @@ "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 #, fuzzy msgid "Delete this Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 #, fuzzy, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3619,101 +3682,111 @@ msgid "Invalidate Repository Cache" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 msgid "Private Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "Empty repository" +msgid "Fork of repository" +msgstr "Lege repository" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 msgid "Remote repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 -msgid "Confirm to pull changes from remote repository." -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3723,33 +3796,33 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3762,312 +3835,371 @@ msgstr "" #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 msgid "Repositories Administration" msgstr "" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 msgid "Settings Administration" msgstr "" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems like Google" +" Analytics or Piwik, but also to perform " +"instance-specific customizations like adding a " +"project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 msgid "Save Settings" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 msgid "" "Check this option to remove all comments, pull requests and other records" " related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 +msgid "Install Git hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 +#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " "not seem to come from Kallithea. WARNING: This operation will destroy any" " custom git hooks you may have deployed by hand!" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/templates/admin/settings/settings_mapping.html:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 msgid "Mercurial extensions" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 +msgid "Enable hgsubversion extension" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:47 -msgid "Enable largefiles extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:51 -msgid "Enable hgsubversion extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 msgid "Location of repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting" " take effect." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4084,101 +4216,125 @@ "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." "\n" -" The following " +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user" +" username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repositories" +msgid "Repository page size" +msgstr "Repositories" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 msgid "Show Members" msgstr "" @@ -4188,13 +4344,15 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4203,48 +4361,59 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 msgid "User Groups Administration" msgstr "" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "" @@ -4254,12 +4423,14 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "" @@ -4268,7 +4439,8 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4277,726 +4449,888 @@ msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 msgid "Users Administration" msgstr "" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:142 -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:147 +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:154 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:331 +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:155 +#: kallithea/tests/data/templates/base/base.html.py:399 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:157 +#: kallithea/tests/data/templates/base/base.html.py:405 msgid "Lock" msgstr "" +#: kallithea/templates/base/base.html:165 +#: kallithea/tests/data/templates/base/base.html.py:413 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 +msgid "Fork" +msgstr "" + #: kallithea/templates/base/base.html:170 -msgid "Follow" -msgstr "" - -#: kallithea/templates/base/base.html:171 -msgid "Unfollow" -msgstr "" - -#: kallithea/templates/base/base.html:174 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 +msgid "Create Pull Request" msgstr "" #: kallithea/templates/base/base.html:175 -#: kallithea/templates/pullrequests/pullrequest.html:88 -msgid "Create Pull Request" -msgstr "" - -#: kallithea/templates/base/base.html:180 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:485 +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:305 +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "" +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 +msgid "Gists" +msgstr "" + #: kallithea/templates/base/base.html:311 -#: kallithea/templates/base/base.html:312 -msgid "Public journal" -msgstr "" - -#: kallithea/templates/base/base.html:317 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:318 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:322 +#: kallithea/tests/data/templates/base/base.html.py:525 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:330 +#: kallithea/templates/base/base.html:319 +#: kallithea/tests/data/templates/base/base.html.py:540 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:353 -#: kallithea/templates/base/base.html:354 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:377 +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:384 +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 msgid "Login to Your Account" msgstr "" +#: kallithea/templates/base/base.html:385 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:389 +msgid "Don't have an account?" +msgstr "" + #: kallithea/templates/base/base.html:407 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:434 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:615 -msgid "Keyboard shortcuts" -msgstr "" - -#: kallithea/templates/base/base.html:624 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 msgid "Inherit defaults" msgstr "" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -#, fuzzy -msgid "Add Another Comment" -msgstr "" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - #: kallithea/templates/base/root.html:25 -msgid "Group" +#: kallithea/tests/data/templates/base/root.html.py:85 +#, fuzzy +msgid "Add Another Comment" msgstr "" #: kallithea/templates/base/root.html:26 -msgid "members" +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:27 -msgid "Loading ..." +#: kallithea/tests/data/templates/base/root.html.py:89 +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:28 -msgid "loading ..." +#: kallithea/tests/data/templates/base/root.html.py:91 +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/tests/data/templates/base/root.html.py:93 +msgid "members" msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" +#: kallithea/tests/data/templates/base/root.html.py:95 +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:31 +#: kallithea/tests/data/templates/base/root.html.py:97 +msgid "loading ..." +msgstr "" + +#: kallithea/templates/base/root.html:32 +#: kallithea/tests/data/templates/base/root.html.py:99 +msgid "Search truncated" +msgstr "" + +#: kallithea/templates/base/root.html:33 +#: kallithea/tests/data/templates/base/root.html.py:101 +msgid "No matching files" +msgstr "" + +#: kallithea/templates/base/root.html:34 +#: kallithea/tests/data/templates/base/root.html.py:103 #, fuzzy msgid "Open New Pull Request from {0}" msgstr "Statuswijziging -> %s" -#: kallithea/templates/base/root.html:32 +#: kallithea/templates/base/root.html:35 +#: kallithea/tests/data/templates/base/root.html.py:105 msgid "Open New Pull Request for {0} → {1}" msgstr "" -#: kallithea/templates/base/root.html:33 +#: kallithea/templates/base/root.html:36 +#: kallithea/tests/data/templates/base/root.html.py:107 #, fuzzy msgid "Show Selected Changesets {0} → {1}" msgstr "Selecteer de changeset" -#: kallithea/templates/base/root.html:34 +#: kallithea/templates/base/root.html:37 +#: kallithea/tests/data/templates/base/root.html.py:109 msgid "Selection Link" msgstr "" -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -#: kallithea/templates/changeset/diff_block.html:21 -msgid "Collapse Diff" -msgstr "" - -#: kallithea/templates/base/root.html:36 -msgid "Expand Diff" -msgstr "" - -#: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" -msgstr "" - #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 +msgid "Collapse Diff" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" +#: kallithea/tests/data/templates/base/root.html.py:113 +msgid "Expand Diff" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/base/root.html.py:115 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "Selecteer een changeset" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 #, fuzzy msgid "Specify changeset" msgstr "Selecteer de changeset" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." msgstr "" #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 msgid "Go to tip of repository" msgstr "" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 #, python-format msgid "" "Changeset status: %s by %s\n" "Click to open associated pull request %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/changelog/changelog_summary_data.html:24 +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 #, fuzzy, python-format -#| msgid "Set changeset status" msgid "Changeset status: %s by %s" msgstr "Selecteer de changeset" +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 +msgid "Expand commit message" +msgstr "" + #: kallithea/templates/changelog/changelog.html:116 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:125 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:57 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:141 -#: kallithea/templates/changelog/changelog_summary_data.html:63 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#: kallithea/templates/compare/compare_cs.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:203 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:146 -#: kallithea/templates/changelog/changelog_summary_data.html:68 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:311 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:47 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:87 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:93 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 msgid "Push new repository" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:101 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:39 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:75 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 msgid "Merge" msgstr "" +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 +msgid "Grafted from:" +msgstr "" + #: kallithea/templates/changeset/changeset.html:123 -msgid "Grafted from:" +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 +msgid "Transplanted from:" msgstr "" #: kallithea/templates/changeset/changeset.html:129 -msgid "Transplanted from:" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:329 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:62 -#: kallithea/templates/pullrequests/pullrequest_show.html:331 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:231 -#: kallithea/templates/changeset/changeset.html:268 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 msgid "No revisions" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 #, fuzzy msgid "on pull request" msgstr "Statuswijziging -> %s" -#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 msgid "No title" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 #, fuzzy msgid "on this changeset" msgstr "Selecteer de changeset" -#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 #, fuzzy msgid "Delete comment?" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 #, fuzzy msgid "Status change" msgstr "Statuswijziging -> %s" -#: kallithea/templates/changeset/changeset_file_comment.html:59 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 msgid "Commenting on line." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:60 +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 msgid "" "Comments are in plain text. Use @username inside this text to notify " "another user." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 #, fuzzy msgid "Set changeset status" msgstr "Selecteer de changeset" -#: kallithea/templates/changeset/changeset_file_comment.html:69 +#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:75 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 msgid "No change" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 #, fuzzy msgid "Finish pull request" msgstr "Statuswijziging -> %s" -#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 #, fuzzy msgid "Close" msgstr "(gesloten)" -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 msgid "Submitting ..." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:104 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:116 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:129 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, fuzzy, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:130 +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 #, python-format msgid "%d general" msgid_plural "%d general" @@ -5004,221 +5338,339 @@ msgstr[1] "" #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +msgid "Modified" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 msgid "Deleted" msgstr "" -#: kallithea/templates/changeset/diff_block.html:57 +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 msgid "Renamed" msgstr "" -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Ongekende revisie %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Geen bestandsnaam" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:69 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:83 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "" #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:85 +#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:321 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:99 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:107 +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:108 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, fuzzy, python-format msgid "%s changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:109 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 msgid "behind" msgstr "" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "" #: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "" #: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "Comment on Changeset \"%s\"" +msgstr "Selecteer de changeset" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset" +msgid "Changeset on" +msgstr "Changeset" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Branch" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Statuswijziging -> %s" + +#: kallithea/templates/email_templates/comment.html:33 +msgid "The pull request has been closed." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 msgid "We have received a request to reset the password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:8 +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 msgid "" "This account is however managed outside this system and the password " "cannot be changed here." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:13 +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "on pull request" +msgid "Pull request from" +msgstr "Statuswijziging -> %s" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +msgid "at" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "on pull request" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "Statuswijziging -> %s" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" msgstr "" #: kallithea/templates/files/diff_2way.html:15 @@ -5237,83 +5689,105 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 +#: kallithea/tests/data/templates/files/files_add.html.py:241 msgid "New file type" msgstr "" -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 #, fuzzy msgid "Commit Changes" msgstr "Selecteer de changeset" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:62 -msgid "Last Revision" -msgstr "" - #: kallithea/templates/files/files_browser.html:63 -msgid "Last Modified" +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 +msgid "Size" msgstr "" #: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 msgid "Last Committer" msgstr "" @@ -5323,7 +5797,7 @@ msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5336,109 +5810,128 @@ msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "" -#: kallithea/templates/files/files_source.html:74 +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 msgid "File is too big to display." msgstr "" -#: kallithea/templates/files/files_source.html:76 +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 msgid "Show full annotation anyway." msgstr "" -#: kallithea/templates/files/files_source.html:78 +#: kallithea/templates/files/files_source.html:73 +#: kallithea/tests/data/templates/files/files_source.html.py:133 msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "" @@ -5447,70 +5940,80 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 -msgid "ATOM journal feed" -msgstr "" - #: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "" @@ -5524,34 +6027,45 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "" @@ -5586,7 +6100,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "" @@ -5604,120 +6120,153 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, python-format msgid "%s Pull Request %s" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, python-format msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 msgid "There are no reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 msgid "on" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:215 +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 msgid "" -"Pull requests do not change once created. Select a revision and save to " -"replace this pull request with a new one." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:224 +"Pull request iterations do not change content once created. Select a " +"revision and save to make a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +#, fuzzy +msgid "Cancel Changes" +msgstr "Selecteer de changeset" + +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 msgid "Pull Request Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:249 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 #, fuzzy msgid "Remove reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:269 +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 #, fuzzy msgid "Potential Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:272 +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:295 -msgid "Save Changes" +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 +msgid "Pull Request Content" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:296 -msgid "Save Updates as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:297 -#, fuzzy -msgid "Cancel Changes" -msgstr "Selecteer de changeset" - -#: kallithea/templates/pullrequests/pullrequest_show.html:307 -msgid "Pull Request Content" +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +msgid "Common ancestor" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 @@ -5735,240 +6284,464 @@ msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 msgid "Search in All Repositories" msgstr "" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "" +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "" + #: kallithea/templates/summary/statistics.html:390 -msgid "commits" +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" msgstr "" #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" +#: kallithea/tests/data/templates/summary/statistics.html.py:153 +msgid "files removed" msgstr "" #: kallithea/templates/summary/statistics.html:393 -msgid "files removed" +#: kallithea/tests/data/templates/summary/statistics.html.py:155 +msgid "commit" +msgstr "" + +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 +msgid "file added" msgstr "" #: kallithea/templates/summary/statistics.html:395 -msgid "commit" +#: kallithea/tests/data/templates/summary/statistics.html.py:159 +msgid "file changed" msgstr "" #: kallithea/templates/summary/statistics.html:396 -msgid "file added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:397 -msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "" +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 +msgid "Show by ID" +msgstr "" + #: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/summary/summary.html.py:143 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "" +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 +msgid "Download" +msgstr "" + +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 +msgid "Downloads are disabled for this repository" +msgstr "" + #: kallithea/templates/summary/summary.html:108 -msgid "Download" +#: kallithea/tests/data/templates/summary/summary.html.py:190 +msgid "Download as zip" msgstr "" #: kallithea/templates/summary/summary.html:112 -msgid "There are no downloads yet" +#: kallithea/tests/data/templates/summary/summary.html.py:194 +msgid "Check this to download archive with subrepos" msgstr "" #: kallithea/templates/summary/summary.html:114 -msgid "Downloads are disabled for this repository" -msgstr "" - -#: kallithea/templates/summary/summary.html:120 -msgid "Download as zip" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 -msgid "Check this to download archive with subrepos" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 +#: kallithea/tests/data/templates/summary/summary.html.py:196 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 #, fuzzy msgid "Latest Changes" msgstr "Statuswijziging -> %s" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "" +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." +"\n" +" The following " +"variables are available:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "" +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +msgid "The comment was made with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" msgstr "" #~ msgid "No comments." @@ -6022,9 +6795,6 @@ #~ msgid "No Files" #~ msgstr "" -#~ msgid "" -#~ msgstr "" - #~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" #~ msgstr "" @@ -6367,7 +7137,235 @@ #~ msgid "Pull Requests from %s'" #~ msgstr "" +#~ msgid "Missing changesets since the previous pull request:" +#~ msgstr "" + +#~ msgid "New changesets on %s %s since the previous pull request:" +#~ msgstr "" + +#~ msgid "Ancestor didn't change - show diff since previous version:" +#~ msgstr "" + #~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request %s" -#~ msgstr "" +#~ "This pull request is based on " +#~ "another %s revision and there is " +#~ "no simple diff." +#~ msgstr "" + +#~ msgid "No changes found on %s %s since previous version." +#~ msgstr "" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "" + +#~ msgid "Pull request update created" +#~ msgstr "" + +#~ msgid "The following changes are available on %s:" +#~ msgstr "" + +#~ msgid "No changesets found for updating this pull request." +#~ msgstr "" + +#~ msgid "Git pull requests don't support updates yet." +#~ msgstr "" + +#~ msgid "Closing." +#~ msgstr "" + +#~ msgid "An error occurred during creation of field" +#~ msgstr "" + +#~ msgid "Changeset not found" +#~ msgstr "" + +#~ msgid "Repository no access" +#~ msgstr "" + +#~ msgid "Repository read access" +#~ msgstr "" + +#~ msgid "Repository write access" +#~ msgstr "" + +#~ msgid "Repository admin access" +#~ msgstr "" + +#~ msgid "Repository Group no access" +#~ msgstr "" + +#~ msgid "Repository Group read access" +#~ msgstr "" + +#~ msgid "Repository Group write access" +#~ msgstr "" + +#~ msgid "Repository Group admin access" +#~ msgstr "" + +#~ msgid "Repository creation disabled" +#~ msgstr "" + +#~ msgid "Repository creation enabled" +#~ msgstr "" + +#~ msgid "Repository forking disabled" +#~ msgstr "" + +#~ msgid "Repository forking enabled" +#~ msgstr "" + +#~ msgid "Register disabled" +#~ msgstr "" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "" + +#~ msgid "Not Reviewed" +#~ msgstr "" + +#~ msgid "Rejected" +#~ msgstr "" + +#~ msgid "Under Review" +#~ msgstr "" + +#~ msgid "Repository group no access" +#~ msgstr "" + +#~ msgid "Repository group read access" +#~ msgstr "" + +#~ msgid "Repository group write access" +#~ msgstr "" + +#~ msgid "Repository group admin access" +#~ msgstr "" + +#~ msgid "User group no access" +#~ msgstr "" + +#~ msgid "User group read access" +#~ msgstr "" + +#~ msgid "User group write access" +#~ msgstr "" + +#~ msgid "User group admin access" +#~ msgstr "" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "" + +#~ msgid "User Group creation disabled" +#~ msgstr "" + +#~ msgid "User Group creation enabled" +#~ msgstr "" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "" + +#~ msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "repositories" +#~ msgstr "" + +#~ msgid "No repositories found." +#~ msgstr "" + +#~ msgid "There are no branches yet" +#~ msgstr "" + +#~ msgid "There are no tags yet" +#~ msgstr "" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "" + +#~ msgid "Analytics HTML block" +#~ msgstr "" + +#~ msgid "" +#~ "HTML with JavaScript for web analytics" +#~ " systems like Google Analytics or " +#~ "Piwik. This will be added at the" +#~ " bottom of every page." +#~ msgstr "" + +#~ msgid "" +#~ "Schema of clone URL construction eg. " +#~ "'{scheme}://{user}@{netloc}/{repo}'.\n" +#~ " The " +#~ "following variables are available:\n" +#~ " {scheme}" +#~ " 'http' or 'https' sent from running" +#~ " Kallithea server,\n" +#~ " {user}" +#~ " current user username,\n" +#~ " {netloc}" +#~ " network location/server host of running" +#~ " Kallithea server,\n" +#~ " {repo}" +#~ " full repository name,\n" +#~ " {repoid}" +#~ " ID of repository, can be used " +#~ "to contruct clone-by-id" +#~ msgstr "" + +#~ msgid "enabled" +#~ msgstr "" + +#~ msgid "disabled" +#~ msgstr "" + +#~ msgid "%s Bookmarks" +#~ msgstr "" + +#~ msgid "Compare Bookmarks" +#~ msgstr "" + +#~ msgid "%s Branches" +#~ msgstr "" + +#~ msgid "Compare Branches" +#~ msgstr "" + +#~ msgid "Editing file" +#~ msgstr "" + +#~ msgid "Update" +#~ msgstr "" + +#~ msgid "" +#~ "Pull requests do not change once " +#~ "created. Select a revision and save " +#~ "to replace this pull request with " +#~ "a new one." +#~ msgstr "" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "" + +#~ msgid "%s Tags" +#~ msgstr "" + +#~ msgid "Compare Tags" +#~ msgstr "" + diff -r a48802bf7134 -r 880e2f07651b kallithea/i18n/pl/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Thu Jul 27 03:02:37 2017 +0200 +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Thu Jul 27 14:26:14 2017 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2016-03-14 16:51+0100\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: 2015-04-04 09:08+0200\n" "Last-Translator: Andrew Shadura \n" "Language-Team: Polish " @@ -24,82 +24,101 @@ "|| n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 2.3-dev\n" -#: kallithea/controllers/changelog.py:85 -#: kallithea/controllers/pullrequests.py:240 kallithea/lib/base.py:515 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "Brak zestawienia zmian" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "Brak" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:198 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "(zamknięty)" -#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "pokazuj spacje" -#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 msgid "Ignore whitespace" msgstr "Ignoruj pokazywanie spacji" -#: kallithea/controllers/changeset.py:168 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:744 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "Wybrane zmiany" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "Potwierdź blokowanie repozytorium" + +#: kallithea/controllers/compare.py:73 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 #, fuzzy msgid "No response" msgstr "rewizja" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" "Wniosek nie może być rozumiany przez serwer z powodu zniekształconej " "składni." -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Nieautoryzowany dostęp do zasobów" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "Nie masz uprawnień do przeglądania tej strony" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "Zasób nie został znaleziony" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -107,374 +126,390 @@ "Serwer napotkał niespodziewany warunek, który uniemożliwia jej spełnienie" " żądania." -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "Zmiany w %s repozytorium" - -#: kallithea/controllers/feed.py:56 -#, python-format -msgid "%s %s feed" -msgstr "%s %s zasilać" - -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 msgid "Changeset was too big and was cut off..." msgstr "Lista zmian była zbyt duża i została ucięta..." -#: kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:84 #, python-format msgid "%s committed on %s" msgstr "%s zakomitowal w %s" -#: kallithea/controllers/files.py:92 -msgid "Click here to add new file" -msgstr "Kliknij tutaj, by dodać nowy plik" +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 +#, python-format +msgid "%s %s feed" +msgstr "%s %s zasilać" + +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 +#, python-format +msgid "Changes on %s repository" +msgstr "Zmiany w %s repozytorium" #: kallithea/controllers/files.py:93 +msgid "Click here to add new file" +msgstr "Kliknij tutaj, by dodać nowy plik" + +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:195 +#: kallithea/controllers/files.py:191 #, fuzzy, python-format msgid "%s at %s" msgstr "w %s i %s" -#: kallithea/controllers/files.py:307 kallithea/controllers/files.py:367 -#: kallithea/controllers/files.py:434 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Repozytorium zostało zablokowane przez %s na %s" -#: kallithea/controllers/files.py:319 +#: kallithea/controllers/files.py:309 #, fuzzy msgid "You can only delete files with revision being a valid branch" msgstr "Można tylko edytować pliki z rewizji obecnej gałęzi " -#: kallithea/controllers/files.py:330 +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:352 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:356 kallithea/controllers/files.py:422 -#: kallithea/controllers/files.py:503 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "Wystąpił błąd w trakcie zatwierdzania" -#: kallithea/controllers/files.py:379 +#: kallithea/controllers/files.py:369 #, fuzzy msgid "You can only edit files with revision being a valid branch" msgstr "Można tylko edytować pliki z rewizji obecnej gałęzi " -#: kallithea/controllers/files.py:393 +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "Edytowanie %s w Kallithea" -#: kallithea/controllers/files.py:409 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "Bez zmian" -#: kallithea/controllers/files.py:418 kallithea/controllers/files.py:492 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "Committ wykonany do %s" -#: kallithea/controllers/files.py:445 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "Dodano %s poprzez Kallithea" -#: kallithea/controllers/files.py:466 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "Brak treści" -#: kallithea/controllers/files.py:470 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "Brak nazwy pliku" -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "Lokalizacja musi być ścieżką względną i nie może zawierać .. ścieżki" +#: kallithea/controllers/files.py:517 +msgid "Downloads disabled" +msgstr "Pobieranie wyłączone" + #: kallithea/controllers/files.py:528 -msgid "Downloads disabled" -msgstr "Pobieranie wyłączone" - -#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "Nieznana wersja %s" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "Puste repozytorium" -#: kallithea/controllers/files.py:543 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "Nieznany typ archiwum" -#: kallithea/controllers/files.py:773 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "Różnice" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "Gałęzie" -#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "Etykiety" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:94 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:479 -#: kallithea/templates/base/base.html:653 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "Repozytoria" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "gałąź" -#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "Zamknięte Gałęzie" -#: kallithea/controllers/home.py:151 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "Tag" -#: kallithea/controllers/home.py:157 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "Bookmark" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "Dziennik Publiczny" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:306 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "Dziennik" -#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:150 +#: kallithea/controllers/login.py:148 +#, python-format msgid "You have successfully registered with %s" msgstr "Udało Ci się zarejestrować w %s" -#: kallithea/controllers/login.py:195 +#: kallithea/controllers/login.py:193 #, fuzzy msgid "A password reset confirmation code has been sent" msgstr "Twój link zresetowania hasła został wysłany" -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:242 #, fuzzy msgid "Invalid password reset token" msgstr "łącze resetowania hasła" -#: kallithea/controllers/login.py:249 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:123 +#: kallithea/controllers/pullrequests.py:73 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:135 #, python-format msgid "%s (closed)" msgstr "%s (zamknięty)" -#: kallithea/controllers/pullrequests.py:151 +#: kallithea/controllers/pullrequests.py:162 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 msgid "Changeset" msgstr "Grupy zmian" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:183 msgid "Special" msgstr "Specjalne" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:184 msgid "Peer branches" msgstr "gałęzie" -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 msgid "Bookmarks" msgstr "Zakładki" -#: kallithea/controllers/pullrequests.py:312 +#: kallithea/controllers/pullrequests.py:326 #, python-format msgid "Error creating pull request: %s" msgstr "" +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 +msgid "Error occurred while creating pull request" +msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi" + #: kallithea/controllers/pullrequests.py:358 -#: kallithea/controllers/pullrequests.py:505 -msgid "No description" -msgstr "Brak opisu" - -#: kallithea/controllers/pullrequests.py:365 msgid "Successfully opened new pull request" msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/pullrequests.py:368 -#: kallithea/controllers/pullrequests.py:455 -#: kallithea/controllers/pullrequests.py:512 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:371 -#: kallithea/controllers/pullrequests.py:458 -msgid "Error occurred while creating pull request" -msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi" - -#: kallithea/controllers/pullrequests.py:403 -msgid "Missing changesets since the previous pull request:" -msgstr "" +#: kallithea/controllers/pullrequests.py:381 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" +msgstr "Recenzje wniosków połączenia gałęzi" #: kallithea/controllers/pullrequests.py:410 #, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:417 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:426 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:464 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:472 -msgid "Pull request update created" -msgstr "Recenzje wniosków połączenia gałęzi" - -#: kallithea/controllers/pullrequests.py:516 +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:414 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "Brak opisu" + +#: kallithea/controllers/pullrequests.py:439 #, fuzzy msgid "Pull request updated" msgstr "Połączone gałęzie" -#: kallithea/controllers/pullrequests.py:531 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:491 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:599 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:617 -#, python-format -msgid "The following changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:621 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:629 +#: kallithea/controllers/pullrequests.py:552 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:556 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:635 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:571 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:573 +#, python-format +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 #, fuzzy msgid "No permission to change pull request status" msgstr "Zagłosuj na żądanie na grupę zmian" -#: kallithea/controllers/pullrequests.py:738 +#: kallithea/controllers/pullrequests.py:676 #, fuzzy, python-format msgid "Successfully deleted pull request %s" msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/pullrequests.py:748 -msgid "Closing." -msgstr "Zamknięcie." - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "Nieprawidłowe zapytania. Spróbuj zacytować go." -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "Nie ma szukanego indeksu. Proszę uruchomić indeksowanie whoosh" -#: kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Wystąpił błąd podczas operacji wyszukiwania." -#: kallithea/controllers/summary.py:181 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 #, fuzzy msgid "No data ready yet" msgstr "Żadne dane nie zostały załadowane" -#: kallithea/controllers/summary.py:184 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "Statystyki są wyłączone dla tego repozytorium" @@ -486,153 +521,157 @@ msgid "error occurred during update of auth settings" msgstr "wystapił błąd podczas uaktualniania ustawień autentykacji" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "Domyślne ustawienia zostały pomyślnie zaktualizowane" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "wystąpił błąd podczas aktualizacji wartości domyślnych" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 #, fuzzy msgid "Forever" msgstr "na zawsze" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "5 minutes" msgstr "5 minut" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 hour" msgstr "1 godzina" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 msgid "1 day" msgstr "1 dzień" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "1 miesiąc" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:290 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "Czas życia" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "Wystąpił błąd podczas tworzenia git" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "Usuń gist %s" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:200 #, fuzzy msgid "Unmodified" msgstr "Ostatnio modyfikowany" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej " "aplikacji" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "Twoje konto zostało pomyślnie zaktualizowane" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:201 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "wystąpił błąd podczas aktualizacji użytkownika %s" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "Dodano e-mail %s do użytkownika" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "Usunięto e-mail użytkownikowi" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:324 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "Odczyt" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" -msgstr "Zapis" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" +msgstr "Odczyt" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "Zapis" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -640,615 +679,649 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:336 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:344 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "Administracja" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "Wyłączone" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "Dozwolona z ręczną aktywacją konta" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "Dozwolona z automatyczną aktywacją konta" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1705 -msgid "Manual activation of external account" -msgstr "Ręczna aktywacja nowego konta" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1706 -msgid "Automatic activation of external account" -msgstr "Automatyczna aktywacja nowego konta" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "Wyłączone" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "Dozwolona z ręczną aktywacją konta" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "Dozwolona z automatyczną aktywacją konta" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "Ręczna aktywacja nowego konta" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "Automatyczna aktywacja nowego konta" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "Włączone" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "Globalne uprawnienia zaktualizowane poprawnie" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Wystąpił błąd podczas aktualizacji uprawnień" -#: kallithea/controllers/admin/repo_groups.py:187 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Wystąpił błąd podczas tworzenia grupy repo %s" -#: kallithea/controllers/admin/repo_groups.py:192 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "Utworzono grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:249 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "Zaktualizowano grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:248 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Wystąpił błąd podczas aktualizacji grupy repo %s" -#: kallithea/controllers/admin/repo_groups.py:283 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta" -#: kallithea/controllers/admin/repo_groups.py:290 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta" -#: kallithea/controllers/admin/repo_groups.py:296 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "Usunięto grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:301 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Wystąpił błąd podczas usuwania z repozytorium grupy %s" -#: kallithea/controllers/admin/repo_groups.py:404 -#: kallithea/controllers/admin/repo_groups.py:439 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "Nie można cofnąć zezwolenia dla admina jako admin" -#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "Aktualizacja uprawnień grup repozytorium" -#: kallithea/controllers/admin/repo_groups.py:456 -#: kallithea/controllers/admin/repos.py:397 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "Wystąpił błąd podczas cofania zezwolenia" -#: kallithea/controllers/admin/repos.py:151 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "utworzone repozytorium %s" -#: kallithea/controllers/admin/repos.py:212 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "utworzone repozytorium %s z %s" -#: kallithea/controllers/admin/repos.py:221 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "Gałęzi %s w repozytorium %s" -#: kallithea/controllers/admin/repos.py:224 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "Utworzone repozytorium %s" -#: kallithea/controllers/admin/repos.py:261 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "Repozytorium %s zostało pomyślnie zaktualizowane" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "Wystąpił błąd podczas aktualizacji repozytorium %s" -#: kallithea/controllers/admin/repos.py:309 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "Oderwane rozgałęzienie %s" -#: kallithea/controllers/admin/repos.py:312 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "Usunięte repozytorium %s" -#: kallithea/controllers/admin/repos.py:317 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "Usunięte repozytorium %s" -#: kallithea/controllers/admin/repos.py:320 +#: kallithea/controllers/admin/repos.py:289 #, fuzzy, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Nie można usunąć %s nadal zawiera załączniki rozgałęzienia" -#: kallithea/controllers/admin/repos.py:325 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "Wystąpił błąd podczas usuwania %s" -#: kallithea/controllers/admin/repos.py:373 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "Uprawnienia repozytorium zostały zaktualizowane" -#: kallithea/controllers/admin/repos.py:429 -msgid "An error occurred during creation of field" +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, fuzzy, python-format +#| msgid "An error occurred during creation of field" +msgid "An error occurred during creation of field: %r" msgstr "Wystąpił błąd podczas tworzenia użytkownika %s" -#: kallithea/controllers/admin/repos.py:443 +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: kallithea/controllers/admin/repos.py:459 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "-- Brak rozgalezienia --" -#: kallithea/controllers/admin/repos.py:490 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "Zaktualizowano widoczność stron w publicznym dzienniku" -#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "Wystąpił błąd podczas ustawiania tego repozytorium w dzienniku publicznym" -#: kallithea/controllers/admin/repos.py:511 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "Brak" -#: kallithea/controllers/admin/repos.py:513 +#: kallithea/controllers/admin/repos.py:473 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Oznaczono %s repo jako rozwidlenie %s" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:480 msgid "An error occurred during this operation" msgstr "Wystąpił błąd podczas tej operacji" -#: kallithea/controllers/admin/repos.py:536 -#: kallithea/controllers/admin/repos.py:563 +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 #, fuzzy msgid "Repository has been locked" msgstr "Repozytorium nie jest zablokowane" -#: kallithea/controllers/admin/repos.py:539 -#: kallithea/controllers/admin/repos.py:560 +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 #, fuzzy msgid "Repository has been unlocked" msgstr "Repozytorium nie jest zablokowane" -#: kallithea/controllers/admin/repos.py:542 -#: kallithea/controllers/admin/repos.py:567 +#: kallithea/controllers/admin/repos.py:502 +#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during unlocking" msgstr "Wystąpił błąd podczas odblokowywania" -#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:533 msgid "Cache invalidation successful" msgstr "Cache wyczyszczony poprawnie" -#: kallithea/controllers/admin/repos.py:585 +#: kallithea/controllers/admin/repos.py:537 msgid "An error occurred during cache invalidation" msgstr "Wystąpił błąd podczas unieważniania cache" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "Pobieranie z lokalizacji zdalnej" -#: kallithea/controllers/admin/repos.py:603 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej" -#: kallithea/controllers/admin/repos.py:636 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk" -#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "Aktualizacja ustawień VCS" -#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:151 -#: kallithea/controllers/admin/settings.py:248 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień aplikacji" -#: kallithea/controllers/admin/settings.py:187 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" "Repozytoria z powodzeniem zostały ponownie zeskanowane dodano: %s, " "usunięto: %s." -#: kallithea/controllers/admin/settings.py:244 +#: kallithea/controllers/admin/settings.py:189 +#, fuzzy, python-format +#| msgid "Invalidate cache for all repositories" +msgid "Invalidated %s repositories" +msgstr "Unieważnia cache dla wszystkich repozytoriów" + +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "Aktualizacja ustawień aplikacji" -#: kallithea/controllers/admin/settings.py:301 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Aktualizacja ustawień wizualizacji" -#: kallithea/controllers/admin/settings.py:306 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Proszę podać adres email" -#: kallithea/controllers/admin/settings.py:347 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:378 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "Dodano nowy hook" -#: kallithea/controllers/admin/settings.py:392 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "Aktualizacja hooku" -#: kallithea/controllers/admin/settings.py:396 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "Wystąpił błąd podczas tworzenia hooku" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "Zadanie ponownej indeksacji whoosh zostało zaplanowane" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "Utworzono grupę użytkowników %s" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Wystąpił błąd podczas tworzenia grupy użytkowników %s" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "Zaktualizowano grupę użytkowników %s" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:208 #, python-format msgid "Error occurred during update of user group %s" msgstr "Wystąpił błąd podczas aktualizacji grupy użytkowników %s" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:219 msgid "Successfully deleted user group" msgstr "Grupa użytkowników została usunięta z powodzeniem" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:224 msgid "An error occurred during deletion of user group" msgstr "Wystąpił błąd podczas usuwania grupy użytkowników" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "Grupa docelowa nie może być taka sama" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "Aktualizacja uprawnień grupy użytkowników" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "Aktualizacja uprawnień" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "Wystąpił błąd podczas zapisywania uprawnień" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "Utworzono użytkownika %s" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "Wystąpił błąd podczas tworzenia użytkownika %s" -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "Użytkownik został zaktualizowany" -#: kallithea/controllers/admin/users.py:217 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "Użytkownik został usunięty" -#: kallithea/controllers/admin/users.py:222 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "Wystąpił błąd podczas usuwania użytkownika" -#: kallithea/controllers/admin/users.py:235 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:462 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "Dodano ip %s do listy dozwolonych adresów użytkownia" -#: kallithea/controllers/admin/users.py:468 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: kallithea/controllers/admin/users.py:482 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "Usunięto adres ip z listy dozwolonych adresów dla użytkownika" -#: kallithea/lib/auth.py:737 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "Obserwatorzy %s" -#: kallithea/lib/auth.py:750 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/auth.py:768 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:813 +#: kallithea/lib/auth.py:829 msgid "You need to be a registered user to perform this action" msgstr "Musisz być zarejestrowanym użytkownikiem, żeby wykonać to działanie" -#: kallithea/lib/auth.py:843 +#: kallithea/lib/auth.py:857 msgid "You need to be signed in to view this page" msgstr "Musisz być zalogowany, żeby oglądać stronę" -#: kallithea/lib/base.py:493 +#: kallithea/lib/base.py:449 +msgid "Invalid API key" +msgstr "" + +#: kallithea/lib/base.py:508 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:623 -msgid "Changeset not found" +#: kallithea/lib/base.py:617 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset for %s %s not found in %s" msgstr "Nie znaleziono changeset" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "Plik binarny" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Lista zmian była zbyt duża i została obcięta, użyj menu porównań żeby " "wyświetlić różnice" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "Nie wykryto zmian" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "Usunięta gałąź: %s" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "Utworzony tag: %s" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:613 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset %s not found" +msgstr "Nie znaleziono changeset" + +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Pokaż wszystkie zestawienia zmian changesets %s->%s" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 #, fuzzy msgid "Compare view" msgstr "Wyświetl porównanie" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "i" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "%s więcej" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "rewizja" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, fuzzy, python-format msgid "Fork name %s" msgstr "nazwa rozgałęzienia %s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, fuzzy, python-format msgid "Pull request %s" msgstr "Połączonych gałęzi #%s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "[usunięte] repozytorium" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 msgid "[created] repository" msgstr "[utworzone] repozytorium" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "[utworzone] repozytorium jako rozgałęzienie" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "[rozgałęzione] repozytorium" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "[zaktualizowane] repozytorium" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "[pobierz] archiwum z repozytorium" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "[skasowane] repozytorium" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "[utworzony] użytkownik" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "[zaktualizowany] użytkownik" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "[utworzona] grupa użytkowników" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "[zaktualizowana] grupa użytkowników" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "[komentarz] do zmiany w repozytorium" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "[komentarz] wniosek o połączenie gałęzi" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "[zamknięty] wniosek o połączenie gałęzi" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "[wysłane zmiany] w" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "[synchronizacja przez Kallithea] z repozytorium" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "[pobieranie z zdalnego] do repozytorium" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "[pobrano]" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "[start następnego] repozytorium" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "[zatrzymany po] repozytorium" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr " i %s więcej" -#: kallithea/lib/helpers.py:1128 -#: kallithea/templates/compare/compare_diff.html:71 -#: kallithea/templates/pullrequests/pullrequest_show.html:337 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "Brak plików" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "nowy plik" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "modyfikuj" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "kasuj" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "zmień nazwę" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1469 +#: kallithea/lib/helpers.py:1230 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1259,7 +1332,7 @@ "zmienione z systemie plików proszę uruchomić aplikację ponownie, aby " "ponownie przeskanować repozytoria" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1267,7 +1340,7 @@ msgstr[1] "%d lata" msgstr[2] "%d lat" -#: kallithea/lib/utils2.py:435 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1275,7 +1348,7 @@ msgstr[1] "%d miesięcy" msgstr[2] "%d miesięcy" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1283,7 +1356,7 @@ msgstr[1] "%d dni" msgstr[2] "%d dni" -#: kallithea/lib/utils2.py:437 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1291,7 +1364,7 @@ msgstr[1] "%d godziny" msgstr[2] "%d godzin" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1299,7 +1372,7 @@ msgstr[1] "%d minuty" msgstr[2] "%d minut" -#: kallithea/lib/utils2.py:439 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1307,706 +1380,361 @@ msgstr[1] "%d sekund" msgstr[2] "%d sekund" -#: kallithea/lib/utils2.py:455 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "w %s" -#: kallithea/lib/utils2.py:457 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "%s temu" -#: kallithea/lib/utils2.py:459 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "w %s i %s" -#: kallithea/lib/utils2.py:462 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "%s i %s temu" -#: kallithea/lib/utils2.py:465 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "przed chwilą" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "Brak dostępu do repozytorium" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "Repozytorium do odczytu" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "Repozytorium do zapisu" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "Administracja dostępu do repozytorium" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "Grupy repozytoriów brak dostępu" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "Grupy repozytoriów dostęp do odczytu" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "Grupy repozytoriów dostęp do zapisu" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "Repozytoria Grupy dostęp administratora" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1669 -msgid "Kallithea Administrator" -msgstr "Administrator Repo" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "Tworzenie repozytorium jest wyłączone" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "Tworzenie repozytorium jest włączone" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "Rozwidlenie repozytorium wyłączone" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "Rozwidlenie repozytorium włączone" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "Rejestracja wyłączona" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "Brak Korekty" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2237 -msgid "Approved" -msgstr "Zaakceptowano" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2238 -msgid "Rejected" -msgstr "Odrzucono" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "Objęty Przeglądem" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1518 -msgid "top level" -msgstr "najwyższy poziom" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "Grupy repozytoriów brak dostępu" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "Grupy repozytoriów dostęp do odczytu" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "Grupy repozytoriów dostęp do zapisu" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "Repozytoria Grupy dostęp administratora" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "Ta grupa użytkowników nie ma dostępu" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "Dostęp do grupy parametrów użytkownika" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "Ta grupa użytkowników ma prawo do zapisu" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "Ta grupa użytkowników ma uprawnienia administratora" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "Tworzenie grup repozytoriów wyłączone" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "Tworzenie grup repozytoriów włączone" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "Tworzenie grup użytkowników wyłączone" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "Tworzenie grup użytkowników właczone" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1701 -msgid "Registration disabled" -msgstr "Rejestracja wyłączona" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "Rejestracja użytkownika z ręczną aktywacją konta" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1695 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1696 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "widziany %s" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "[Wymieniony]" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "najwyższy poziom" + +#: kallithea/model/db.py:1715 +msgid "Kallithea Administrator" +msgstr "Administrator Repo" + +#: kallithea/model/db.py:1717 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 +#: kallithea/model/db.py:1718 #, fuzzy msgid "Default user has read access to new repositories" msgstr "Nieautoryzowany dostęp do zasobów" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1719 #, fuzzy msgid "Default user has write access to new repositories" msgstr "Nieautoryzowany dostęp do zasobów" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1720 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1722 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 +#: kallithea/model/db.py:1723 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1724 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1725 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1727 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1728 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1729 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1730 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1732 #, fuzzy msgid "Only admins can create repository groups" msgstr "Utworzono grupę repo %s" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1733 #, fuzzy msgid "Non-admins can create repository groups" msgstr "Utworzono grupę repo %s" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1735 #, fuzzy msgid "Only admins can create user groups" msgstr "Tworzenie grup użytkowników" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1736 #, fuzzy msgid "Non-admins can create user groups" msgstr "Tworzenie grup użytkowników" -#: kallithea/model/db.py:1692 +#: kallithea/model/db.py:1738 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1693 +#: kallithea/model/db.py:1739 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1741 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1742 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1744 #, fuzzy msgid "Only admins can fork repositories" msgstr "Ogólna liczba repozytoriów" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1745 #, fuzzy msgid "Non-admins can fork repositories" msgstr "Unieważnia cache dla wszystkich repozytoriów" -#: kallithea/model/db.py:1702 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "Rejestracja wyłączona" + +#: kallithea/model/db.py:1748 #, fuzzy msgid "User registration with manual account activation" msgstr "Rejestracja użytkownika z ręczną aktywacją konta" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1749 #, fuzzy msgid "User registration with automatic account activation" msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" -#: kallithea/model/db.py:2236 +#: kallithea/model/db.py:2276 #, fuzzy msgid "Not reviewed" msgstr "Brak Korekty" -#: kallithea/model/db.py:2239 +#: kallithea/model/db.py:2277 #, fuzzy msgid "Under review" msgstr "Objęty Przeglądem" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2278 +#, fuzzy +#| msgid "Approved" +msgid "Not approved" +msgstr "Zaakceptowano" + +#: kallithea/model/db.py:2279 +msgid "Approved" +msgstr "Zaakceptowano" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "Wpisz login" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Wprowadź wartość %(min)i znaków lub więcej" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "Wpisz hasło" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "Wpisz %(min)i lub więcej znaków" -#: kallithea/model/forms.py:165 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:240 #, fuzzy, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s skomentował zatwierdzenie %(when)s" -#: kallithea/model/notification.py:255 +#: kallithea/model/notification.py:241 #, fuzzy, python-format msgid "%(user)s sent message %(age)s" msgstr "%(user)s wysłał wiadomość do %(when)s" -#: kallithea/model/notification.py:256 +#: kallithea/model/notification.py:242 #, fuzzy, python-format msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s wspomniał o Tobie w %(when)s" -#: kallithea/model/notification.py:257 +#: kallithea/model/notification.py:243 #, fuzzy, python-format msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s zarejestrował na stronie w %(when)s" -#: kallithea/model/notification.py:258 +#: kallithea/model/notification.py:244 #, fuzzy, python-format msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s otworzył nowe połączenie gałęzi w %(when)s" -#: kallithea/model/notification.py:259 +#: kallithea/model/notification.py:245 #, fuzzy, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s skomentował nowe połączenie gałęzi w %(when)s" -#: kallithea/model/notification.py:266 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s skomentował zatwierdzenie %(when)s" -#: kallithea/model/notification.py:267 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s wysłał wiadomość do %(when)s" -#: kallithea/model/notification.py:268 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s wspomniał o Tobie w %(when)s" -#: kallithea/model/notification.py:269 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s zarejestrował na stronie w %(when)s" -#: kallithea/model/notification.py:270 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s otworzył nowe połączenie gałęzi w %(when)s" -#: kallithea/model/notification.py:271 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s skomentował nowe połączenie gałęzi w %(when)s" -#: kallithea/model/notification.py:302 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:288 +#, fuzzy, python-format +#| msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "[komentarz] wniosek o połączenie gałęzi" + +#: kallithea/model/notification.py:291 #, fuzzy, python-format msgid "New user %(new_username)s registered" msgstr "Użytkownik %(new_username)s zarejestrował" +#: kallithea/model/notification.py:293 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:307 -#, fuzzy, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s: %(pr_title)s" - -#: kallithea/model/notification.py:308 -#, fuzzy, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "[komentarz] wniosek o połączenie gałęzi" - -#: kallithea/model/notification.py:321 #, fuzzy msgid "Closing" msgstr "Używa:" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, fuzzy, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s: %(pr_title)s" -#: kallithea/model/scm.py:708 +#: kallithea/model/pull_request.py:211 +#, fuzzy +#| msgid "Create Pull Request" +msgid "Cannot create empty pull request" +msgstr "Stwórz nowe żądanie połączenia gałęzi" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +#, fuzzy +#| msgid "Confirm to delete this pull request" +msgid "You are not authorized to create the pull request" +msgstr "Potwierdź usunięcie połączenia gałęzi" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "ostatni tip" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "nowy użytkownik się zarejestrował" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 #, fuzzy msgid "You can't remove this user since it is crucial for the entire application" msgstr "" "Nie możesz usunąć tego użytkownika ponieważ jest kluczowy dla całej " "aplikacji" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -2015,7 +1743,7 @@ "użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może " "zostać usunięty. Zmień właściciela lub usuń te repozytoria. %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" @@ -2024,7 +1752,7 @@ "użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może " "zostać usunięty. Zmień właściciela lub usuń te repozytoria. %s" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -2033,37 +1761,37 @@ "użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może " "zostać usunięty. Zmień właściciela lub usuń te repozytoria. %s" -#: kallithea/model/user.py:368 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "łącze resetowania hasła" -#: kallithea/model/user.py:418 +#: kallithea/model/user.py:413 #, fuzzy msgid "Password reset notification" msgstr "łącze resetowania hasła" -#: kallithea/model/user.py:419 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "Wartość listy nie może być pusta" -#: kallithea/model/validators.py:96 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Użytkownik \"%(username)s\" już istnieje" -#: kallithea/model/validators.py:98 +#: kallithea/model/validators.py:75 #, fuzzy, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Nazwa użytkownika %(username)s jest nieprawidłowa" -#: kallithea/model/validators.py:100 +#: kallithea/model/validators.py:77 #, fuzzy msgid "" "Username may only contain alphanumeric characters underscores, periods or" @@ -2073,25 +1801,25 @@ " kropki lub myślniki i muszą zaczynać się znakiem alfanumerycznym lub " "podkreśleniem" -#: kallithea/model/validators.py:127 +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:134 +#: kallithea/model/validators.py:111 #, python-format msgid "Username %(username)s is not valid" msgstr "Nazwa użytkownika %(username)s jest nieprawidłowa" -#: kallithea/model/validators.py:154 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "Niewłaściwa nazwa grupy" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:132 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Nazwa grupy \"%(usergroup)s\" już istnieje" -#: kallithea/model/validators.py:157 +#: kallithea/model/validators.py:134 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -2099,107 +1827,107 @@ "nazwa grupy może zawierać tylko znaki alfanumeryczne, podkreślenia, " "kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym" -#: kallithea/model/validators.py:197 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "Nie można przypisać do tej grupy jako rodzic" -#: kallithea/model/validators.py:198 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Nazwa grupy \"%(group_name)s\" już istnieje" -#: kallithea/model/validators.py:200 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Repozytorium o nazwie \"%(group_name)s\" już istnieje" -#: kallithea/model/validators.py:258 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "Nieprawidłowe znaki (nie-ascii) w haśle" -#: kallithea/model/validators.py:273 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:289 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "Hasła różnią się" -#: kallithea/model/validators.py:304 +#: kallithea/model/validators.py:279 #, fuzzy msgid "Invalid username or password" msgstr "nieprawidłowe hasło" -#: kallithea/model/validators.py:335 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "Niezgodność tokenu" -#: kallithea/model/validators.py:351 +#: kallithea/model/validators.py:326 #, fuzzy, python-format msgid "Repository name %(repo)s is not allowed" msgstr "Nazwa repozytorium %(repo)s jest zabroniona" -#: kallithea/model/validators.py:353 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Repozytorium o nazwie %(repo)s już istnieje" -#: kallithea/model/validators.py:354 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Repozytorium \"%(repo)s\" już istnieje w grupie \"%(group)s\"" -#: kallithea/model/validators.py:356 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Grupa repozytoriów z nazwą \"%(repo)s\" już istnieje" -#: kallithea/model/validators.py:470 +#: kallithea/model/validators.py:449 #, fuzzy msgid "Invalid repository URL" msgstr "prywatne repozytorium" -#: kallithea/model/validators.py:471 +#: kallithea/model/validators.py:450 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:496 +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "Fork musi być tego samego typu, jak rodzic" -#: kallithea/model/validators.py:511 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "Nie masz uprawnień do tworzenia repozytorium w tej grupie" -#: kallithea/model/validators.py:513 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "nie masz uprawnień do tworzenia repozytorium w tej grupie" -#: kallithea/model/validators.py:563 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "Nie masz uprawnień do tworzenia repozytorium w tej grupie" -#: kallithea/model/validators.py:604 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "Ta nazwa użytkownika lub grupy użytkowników nie jest prawidłowa" -#: kallithea/model/validators.py:697 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "To nie jest prawidłowa ścieżka" -#: kallithea/model/validators.py:714 +#: kallithea/model/validators.py:692 #, fuzzy msgid "This email address is already in use" msgstr "Ten adres e-mail jest już zajęty" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:712 #, fuzzy, python-format msgid "Email address \"%(email)s\" not found" msgstr "e-mail \"%(email)s\" nie istnieje." -#: kallithea/model/validators.py:771 +#: kallithea/model/validators.py:749 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -2207,400 +1935,410 @@ "Atrybut logowania CN do LDAP należy określić, jest to nazwa atrybutu, " "który jest odpowiednikiem \"username\"" -#: kallithea/model/validators.py:783 +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Proszę podać poprawny adres IPv4 lub IPv6" -#: kallithea/model/validators.py:784 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "Rozmiar sieci (bits) może mieścić się w zakresie od 0-32 (nie %(bits)r)" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" "Klucz nazwy może składać się tylko z liter, podkreślenia, myślnika lub " "numerów" -#: kallithea/model/validators.py:831 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "Nazwa pliku nie może znajdować się w katalogu" -#: kallithea/model/validators.py:847 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "Repozytorium" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "szybki filtr..." - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "repozytoria" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "Dodaj Repozytorium" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "Dodaj Grupę Repozytoriów" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "Jako administrator uprawnienia tej grupy, i możesz je edytować" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "Edytuj Grupę Repozytoriów" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "Nazwa Grupy" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +#, fuzzy +#| msgid "Repository group" +msgid "Repository Group" +msgstr "Repozytorium grupy" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "Opis" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "Nazwa" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "Repozytorium" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "Ostatnia akytwność" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" msgstr "Ostatnia zmiana" -#: kallithea/templates/index_base.html:132 +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:244 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "Właściciel" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "Kliknij, aby posortować rosnąco" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "Kliknij, aby posortować malejąco" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "Nie znaleziono repozytorium." - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "Błąd danych." - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "Wczytywanie..." - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:414 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "Zaloguj się" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "Zaloguj się do %s" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "Nazwa użytkownika" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "Hasło" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "Zapamiętaj mnie" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "Zapomniałeś hasła?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "Nie masz konta?" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "Zaloguj się" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "Łącze resetowania hasła" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 #, fuzzy, python-format msgid "Reset Your Password to %s" msgstr "Zapomniałeś hasła do %s?" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 #, fuzzy msgid "Reset Your Password" msgstr "Zapomniałeś hasła?" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "Adres Email" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 #, fuzzy msgid "Send Password Reset Email" msgstr "łącze resetowania hasła" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 #, fuzzy msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "Link do zresetowania hasła zostanie wysłany na adres e-mail" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 #, fuzzy msgid "New Password" msgstr "Nowe hasło" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 #, fuzzy msgid "Confirm New Password" msgstr "Nowe hasło" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "Zarejestruj się" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "Ponownie wprowadź hasło" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "Imię" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "Nazwisko" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "E-mail" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "Nie ma jeszcze gałęzi" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "Nie ma jeszcze tagów" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "Nie ma jeszcze zakładek" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 #, fuzzy msgid "Admin Journal" msgstr "Dziennik administratora" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "szybkie wyszukiwanie..." #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 #, fuzzy msgid "Filter" msgstr "filtr" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, fuzzy, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2609,116 +2347,138 @@ msgstr[2] "%s wejść" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "Działanie" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "Repozytorium" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "Data" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "Z IP" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "Brak akcji" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "Ustawienia Autentykacji" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "Autentykacja" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "Wtyczki Autentykacji" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "Włączone Wtyczki" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "Wtyczka" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "Zapisz" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 #, fuzzy msgid "Repository Defaults" msgstr "Repozytoria domyślne" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "Typ" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 msgid "Private repository" msgstr "Prywatne repozytorium" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -2726,34 +2486,40 @@ "Prywatne repozytoria są widoczne tylko dla osób bezpośrednio dodanych " "jako współpracownicy." -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 msgid "Enable statistics" msgstr "Włącz statystyki" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 msgid "Enable statistics window on summary page." msgstr "Włącz okno statystyk na stronie podsumowania." -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 msgid "Enable downloads" msgstr "Włącz pobieranie" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 msgid "Enable download menu on summary page." msgstr "Włącz menu pobierania na stronie podsumowania." -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 msgid "Enable locking" msgstr "Włącz blokowanie" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "Włącz blokowanie pobierania w repozytorium." @@ -2762,326 +2528,479 @@ msgid "Edit Gist" msgstr "Edytuj Gist" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "Opis Gist ..." -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "Trwałość Gist" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" msgstr "Wygasa" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 #, fuzzy msgid "Never" msgstr "nigdy" -#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "Zaktualizuj Gist" -#: kallithea/templates/admin/gists/edit.html:147 -#: kallithea/templates/changeset/changeset_file_comment.html:105 +#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "Anuluj" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, fuzzy, python-format msgid "Private Gists for User %s" msgstr "Prywatne Gists użytkownika %s" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, fuzzy, python-format msgid "Public Gists for User %s" msgstr "Publiczne Gists użytkownika %s" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "Publiczne Gists" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "Utwórz Nowy Gist" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "Utworzono" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "Nie ma jeszcze żadnych gists" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "Nowy Gist" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "Utwórz Prywatny Gist" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "Utwórz Publiczny Gist" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "Zresetuj" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "Gist" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "Adres URL" -#: kallithea/templates/admin/gists/show.html:37 +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 msgid "Public Gist" msgstr "Publiczny Gist" -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/templates/admin/gists/show.html:37 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "Prywatny Gist" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:31 -#: kallithea/templates/changeset/changeset_file_comment.html:95 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "Usuń" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "Potwierdź aby usunąć ten Gist" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "Edycja" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "Edycja" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "utworzono" -#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "wyświetl jako raw" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:431 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "Moje konto" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "Profil" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 #, fuzzy msgid "Email Addresses" msgstr "Nowy adres e-mail" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 #, fuzzy msgid "Owned Repositories" msgstr "repozytoria" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 #, fuzzy msgid "Watched Repositories" msgstr "Utwórz repozytorium" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 #, fuzzy msgid "Show Permissions" msgstr "Skopiuj uprawnienia" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, fuzzy, python-format msgid "Confirm to reset this API key: %s" msgstr "Potwierdź, aby usunąć to ip: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 #, fuzzy msgid "Expired" msgstr "Wygasa" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, fuzzy, python-format msgid "Confirm to remove this API key: %s" msgstr "Potwierdź, aby usunąć to ip: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 #, fuzzy msgid "Remove" msgstr "Usunięto" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 #, fuzzy msgid "No additional API keys specified" msgstr "Brak dodatkowych emaili" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 #, fuzzy msgid "New API key" msgstr "Nowe pole klucza" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "Dodaj" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "Główny" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "Potwierdź, aby usunąć ten e-mail: %s" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 #, fuzzy msgid "No additional emails specified." msgstr "Brak dodatkowych emaili" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "Nowy adres e-mail" @@ -3090,136 +3009,179 @@ msgid "Change Your Account Password" msgstr "Nowe hasło" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "Nowe hasło" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, fuzzy, python-format +#| msgid "Change your avatar at" +msgid "Change %s avatar at" msgstr "Zmiana awataru na" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "Używa" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "Avatary są wyłączone" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 #, fuzzy msgid "Repositories You Own" msgstr "Nie znaleziono repozytorium." -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "Nie znaleziono rekordów." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" +msgstr "Nazwa" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 #, fuzzy msgid "Repositories You are Watching" msgstr "Położenie repozytorium" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "Opcje powiadomień" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "Wszystkie" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "Komentarze" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "Połączone gałęzie" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 #, fuzzy msgid "Mark All Read" msgstr "Oznacz wszystko jako przeczytane" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +#, fuzzy +#| msgid "Mark All Read" +msgid "Mark as read" +msgstr "Oznacz wszystko jako przeczytane" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "Brak powiadomień" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 #, fuzzy msgid "Show Notification" msgstr "Pokaż powiadomienia" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:430 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "Powiadomienia" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 #, fuzzy msgid "Default Permissions" msgstr "Domyślne uprawnienia" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "Globalne" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 #, fuzzy msgid "IP Whitelist" msgstr "Lista dozwolonych adresów IP" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "Dostęp anonimowy" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " @@ -3229,24 +3191,30 @@ "Wybrane uprawnienie zostaną skasowane. Pamiętaj, że wszystkie " "niestandardowe uprawnienia w repozytoriach zostaną utracone" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 #, fuzzy msgid "Apply to all existing repositories" msgstr "Istniejące repozytorium?" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 msgid "Permissions for the Default user on new repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 msgid "Repository group" msgstr "Repozytorium grupy" -#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " @@ -3256,21 +3224,26 @@ "Wybrane uprawnienie zostaną skasowane. Pamiętaj, że wszystkie " "niestandardowe uprawnienia w repozytoriach zostaną utracone" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 #, fuzzy msgid "Apply to all existing repository groups" msgstr "Usuń ta grupę repozytoriów" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "Grupa użytkownika" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 #, fuzzy msgid "" "All default permissions on each user group will be reset to chosen " @@ -3282,108 +3255,137 @@ "niestandardowe uprawnienia domyślne dla grup repozytorium zostaną " "utracone" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 #, fuzzy msgid "Top level repository creation" msgstr "Tworzenie repozytorium" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 msgid "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 msgid "User group creation" msgstr "Tworzenie grupy użytkowników" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "Rozwidlanie repozytorium" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "Rejestracja" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "Autoryzacja aktywacji zewnętrznego konta" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, fuzzy, python-format msgid "Confirm to delete this IP address: %s" msgstr "Potwierdź, aby usunąć to ip: %s" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 #, fuzzy msgid "All IP addresses are allowed." msgstr "Wszystkie adresy IP są dozwolone" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "Nowy adres ip" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "Grupy Repozytoriów" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "Nazwa grupy" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "Rodzic gropy" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "" @@ -3392,31 +3394,42 @@ msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "Ustawienia" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "Zaawansowane" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "Uprawnienia" @@ -3440,12 +3453,14 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "Utworzono" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3457,8 +3472,30 @@ msgid "Delete this repository group" msgstr "Usuń ta grupę repozytoriów" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "Disabled" +msgid "Visible" +msgstr "Wyłączone" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "Add Repository" +msgid "Add repos" +msgstr "Dodaj Repozytorium" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#, fuzzy +#| msgid "Add user group" +msgid "Add/Edit groups" +msgstr "Dodaj grupę użytkowników" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 #, fuzzy msgid "User/User Group" @@ -3466,8 +3503,8 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy @@ -3476,36 +3513,36 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy msgid "Revoke" msgstr "odwołane" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "Dodaj nowe" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #, fuzzy msgid "Apply to children" msgstr "dotyczy dzieci" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "Oba" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" @@ -3513,73 +3550,85 @@ "Włącz blokowanie pobierania przez grupy. Opcja ta będzie stosowana do " "wszystkich innych grup i repozytoriów wewnątrz" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 #, fuzzy msgid "Remove this group" msgstr "Tworzenie grup użytkowników" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 #, fuzzy msgid "Confirm to delete this group" msgstr "Potwierdź usunięcie grupy użytkowników: %s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" +#, fuzzy, python-format +#| msgid "Repository Group: %s" +msgid "Repository group %s" +msgstr "Grupa Repozytoriów: %s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "Strona Główna" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "używając" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 #, fuzzy msgid "Repository Groups Administration" msgstr "Repozytoria grup administracyjnych" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 #, fuzzy msgid "Number of Top-level Repositories" msgstr "Liczba najwyższego poziomu repozytorium" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 #, fuzzy msgid "Clone remote repository" msgstr "[utworzone] repozytorium" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "Powinna być krótka i na temat. Użyj pliku README dla dłuższych opisów." -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "Rodzaj repozytorium do stworzenia." -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "Docelowa rewizja" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3608,61 +3657,74 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, fuzzy, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 #, fuzzy msgid "Extra Fields" msgstr "Dodatkowe pola" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "Zdalnie" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "Statystyki" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 #, fuzzy msgid "Parent" msgstr "Rodzic gropy" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "Ustaw" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 #, fuzzy msgid "Manually set this repository as a fork of another from the list." msgstr "Ręczne ustawienie rozwidlenia z listy" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 #, fuzzy msgid "Public Journal Visibility" msgstr "Dziennik publiczny" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "Usuń z dziennika publicznego" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 #, fuzzy msgid "Add to Public Journal" msgstr "Dziennik publiczny" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 #, fuzzy msgid "" "All actions done in this repository will be visible to everyone in the " @@ -3671,41 +3733,49 @@ "Wszystkie działania wykonywane na tym repozytorium będą dostępne dla " "wszystkich w dzienniku publicznym" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 #, fuzzy msgid "Change Locking" msgstr "Włącz blokowanie" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 #, fuzzy msgid "Confirm to unlock repository." msgstr "Potwierdź odblokowanie repozytorium" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 #, fuzzy msgid "Unlock Repository" msgstr "Odblokowane repozytorium" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 #, python-format msgid "Locked by %s on %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 #, fuzzy msgid "Confirm to lock repository." msgstr "Potwierdź blokowanie repozytorium" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 #, fuzzy msgid "Lock Repository" msgstr "Odblokowane repozytorium" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "Repozytorium nie jest zablokowane" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3713,18 +3783,22 @@ "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Potwierdź usunięcie repozytorium: %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 #, fuzzy msgid "Delete this Repository" msgstr "Usuń ta grupę repozytoriów" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 #, fuzzy, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" @@ -3732,15 +3806,18 @@ msgstr[1] "to repozytorium ma %s forki" msgstr[2] "to repozytorium ma %s forków" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "Ustaw jako rozwidlenie" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "Usuń rozwidlenie" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3752,7 +3829,7 @@ msgid "Invalidate Repository Cache" msgstr "Unieważnij pamięć podręczną repozytorium" -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 #, fuzzy msgid "" "Manually invalidate cache for this repository. On first access, the " @@ -3761,102 +3838,112 @@ "Ręcznie unieważnienie cache dla tego repozytorium. Przy pierwszym " "dostępie do repozytorium zostanie dodany do bufora ponownie" -#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 #, fuzzy msgid "List of Cached Values" msgstr "Lista buforowanych wartości" -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "Prefix" msgstr "Prefiks" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "Klucz" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "Aktywny" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "Potwierdź, aby usunąć to pole: %s" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "Nowe pole klucza" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "Nowa etykieta pola" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "Wpisz krótką etykietę" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "Nowy opis pola" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "Wprowadź opis pola" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 #, fuzzy msgid "Extra fields are disabled." msgstr "Avatary są wyłączone" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "prywatne repozytorium" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "[forked] repository" +msgid "Fork of repository" +msgstr "[rozgałęzione] repozytorium" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "Utworzone repozytorium %s" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 #, fuzzy msgid "Pull Changes from Remote Repository" msgstr "[pobieranie z zdalnego] do repozytorium" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 #, fuzzy msgid "Confirm to pull changes from remote repository." msgstr "Potwierdź pull z zdalnej strony" -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 #, fuzzy msgid "Permanent Repository ID" msgstr "prywatne repozytorium" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3866,35 +3953,35 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "[utworzone] repozytorium" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 #, fuzzy msgid "Repository URL" msgstr "Repozytorium" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "Wersja domyślna dla plików stronicowania, pobierania plików, readme" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "Zmiana właściciela tego repozytorium." -#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 msgid "Processed commits" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 msgid "Processed progress" msgstr "" @@ -3909,285 +3996,339 @@ msgstr "Potwierdź usunięcie aktualnych statystyk" #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 #, fuzzy msgid "Repositories Administration" msgstr "Administracja repozytoriami" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 #, fuzzy msgid "Settings Administration" msgstr "Ustawienia administracji" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "Aktualizacja" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "Wyślij" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "Nazwa strony" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "Sfera uwierzytelniania HTTP" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems like Google" +" Analytics or Piwik, but also to perform " +"instance-specific customizations like adding a " +"project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 #, fuzzy msgid "Save Settings" msgstr "Zapisz ustawienia" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 #, fuzzy msgid "Custom Hooks" msgstr "Niestandardowa aktualizacja" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "Nie udało się usunąć hooka" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Rescan option" +msgid "Rescan options" msgstr "ponowne skanowanie opcji" -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 #, fuzzy msgid "Delete records of missing repositories" msgstr "Szukaj we wszystkich repozytoriach" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 msgid "" "Check this option to remove all comments, pull requests and other records" " related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "Unieważnia cache dla wszystkich repozytoriów" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 #, fuzzy msgid "Check this to reload data and clear cache keys for all repositories." msgstr "Unieważnia cache dla wszystkich repozytoriów" -#: kallithea/templates/admin/settings/settings_mapping.html:23 +#: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 msgid "Install Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 +#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " "not seem to come from Kallithea. WARNING: This operation will destroy any" " custom git hooks you may have deployed by hand!" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/templates/admin/settings/settings_mapping.html:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "Opcja odbudowy indeksowania" -#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 msgid "Build from scratch" msgstr "Buduj od podstaw" -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "Indeksuj ponownie" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Kallithea version" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -#, fuzzy -msgid "Git version" -msgstr "Edycja Uprawnień" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 +msgid "Kallithea configuration file" +msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:10 -msgid "Upgrade info endpoint" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 +#, fuzzy +msgid "Git version" +msgstr "Edycja Uprawnień" + +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 +msgid "Upgrade info endpoint" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "www" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "Wymagaj ssl dla operacji vcs" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "Pokaż rozmiar repozytorium po wysłaniu zmian" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "Logi poleceń wysłania zmian użytkowników" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "Logi poleceń połączenia gałęzi użytkowników" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "Aktualizacja repozytorium po wysłaniu zmian (aktualizacja hg)" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 #, fuzzy msgid "Mercurial extensions" msgstr "Rozszerzenia Mercurial" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 msgid "Enable largefiles extension" msgstr "Rozszerzenia dużych pliów" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 msgid "Enable hgsubversion extension" msgstr "Rozszerzenia hgsubversion" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 #, fuzzy msgid "Location of repositories" msgstr "Ogólna liczba repozytoriów" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting" " take effect." @@ -4195,37 +4336,44 @@ "Kliknij, aby odblokować. Musisz ponownie uruchomić Kallithea żeby " "wprowadzić to ustawienie w życie." -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "Główne" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "Używaj w repozytorium dodatkowych pól" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "Umożliwia przechowywanie dodatkowych niestandardowych pól w repozytorium." -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "Pokaż wersję Kallithea" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4242,103 +4390,128 @@ "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +#, fuzzy +msgid "Clone URL" +msgstr "Url klonowania" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." "\n" -" The following " +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user" +" username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "Pozycja panelu" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repository Size" +msgid "Repository page size" +msgstr "Rozmiar Repozytorium" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 msgid "Icons" msgstr "Ikony" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 msgid "Show public repository icon on repositories" msgstr "Pokazuj w publicznym repo ikonę w repozytoriach" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 msgid "Show private repository icon on repositories" msgstr "Pokazuj w prywatnym repo ikonę w repozytoriach" -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 #, 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 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 #, fuzzy msgid "Meta Tagging" msgstr "Tagowanie meta" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "Dodaj grupę użytkowników" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 #, fuzzy msgid "Show Members" msgstr "użytkownik" @@ -4349,13 +4522,15 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "Użytkownik" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "Potwierdź usunięcie grupy użytkowników: %s" @@ -4364,49 +4539,60 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "Nie ma jeszcze żadnego użytkownika" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "Wybrane grupy użytkowników" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "Dostępni użytkownicy" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 #, fuzzy msgid "User Groups Administration" msgstr "Użytkownicy grupy administracji" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "Dodaj użytkownika" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "Użytkownicy" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "Potwierdzenie hasła" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "" @@ -4416,12 +4602,14 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "" @@ -4430,7 +4618,8 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "Potwierdź usunięcie tego użytkownika: %s" @@ -4439,423 +4628,478 @@ msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "Potwierdzenie nowego hasła" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 #, fuzzy msgid "Users Administration" msgstr "Administracja użytkownikami" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "Wystąpienia serwera: %s" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "Repozytorium mercurial" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "Repozytorium git" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 #, fuzzy msgid "Create Fork" msgstr "Usuń rozwidlenie" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "Podsumowanie" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "Dziennik zmian" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "Pliki" -#: kallithea/templates/base/base.html:142 -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 msgid "Options" msgstr "Opcje" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:147 +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 #, fuzzy msgid "Compare Fork" msgstr "Porównaj rozwidlenie" -#: kallithea/templates/base/base.html:154 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 msgid "Compare" msgstr "Porównaj" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:331 +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 msgid "Search" msgstr "Szukaj" -#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:155 +#: kallithea/tests/data/templates/base/base.html.py:399 msgid "Unlock" msgstr "Odblokowany" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:157 +#: kallithea/tests/data/templates/base/base.html.py:405 msgid "Lock" msgstr "zablokowane" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:165 +#: kallithea/tests/data/templates/base/base.html.py:413 msgid "Follow" msgstr "Obserwuj" -#: kallithea/templates/base/base.html:171 +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 msgid "Unfollow" msgstr "Nie obserwuj" -#: kallithea/templates/base/base.html:174 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 msgid "Fork" msgstr "Gałąź" -#: kallithea/templates/base/base.html:175 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/base/base.html:170 +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 msgid "Create Pull Request" msgstr "Stwórz nowe żądanie połączenia gałęzi" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "Pokaż Prośby Pobrania %s" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 msgid "Switch To" msgstr "Przełącz do" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:485 +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:305 +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "Pokaż ostatnią aktywność" +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 +msgid "Public journal" +msgstr "Dziennik publiczny" + +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 +msgid "Show public gists" +msgstr "Wyświetl publiczne gists" + +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 +msgid "Gists" +msgstr "Gists" + #: kallithea/templates/base/base.html:311 -#: kallithea/templates/base/base.html:312 -msgid "Public journal" -msgstr "Dziennik publiczny" - -#: kallithea/templates/base/base.html:317 -msgid "Show public gists" -msgstr "Wyświetl publiczne gists" - -#: kallithea/templates/base/base.html:318 -msgid "Gists" -msgstr "Gists" - -#: kallithea/templates/base/base.html:322 +#: kallithea/tests/data/templates/base/base.html.py:525 #, fuzzy msgid "All Public Gists" msgstr "Wszystkie publiczne gists" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 #, fuzzy msgid "My Public Gists" msgstr "Moje publiczne gists" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 #, fuzzy msgid "My Private Gists" msgstr "Moje prywatne gists" -#: kallithea/templates/base/base.html:330 +#: kallithea/templates/base/base.html:319 +#: kallithea/tests/data/templates/base/base.html.py:540 msgid "Search in repositories" msgstr "Szukaj we wszystkich repozytoriach" -#: kallithea/templates/base/base.html:353 -#: kallithea/templates/base/base.html:354 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 #, fuzzy msgid "My Pull Requests" msgstr "Połączone gałęzie" -#: kallithea/templates/base/base.html:377 +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 #, fuzzy msgid "Not Logged In" msgstr "Zaloguj się" -#: kallithea/templates/base/base.html:384 +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 #, fuzzy msgid "Login to Your Account" msgstr "Zaloguj się do swojego konta" -#: kallithea/templates/base/base.html:407 -msgid "Forgot password ?" +#: kallithea/templates/base/base.html:385 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" msgstr "Nie pamiętasz hasła?" -#: kallithea/templates/base/base.html:434 +#: kallithea/templates/base/base.html:389 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "Nie masz konta?" + +#: kallithea/templates/base/base.html:407 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "Wyloguj się" -#: kallithea/templates/base/base.html:615 -msgid "Keyboard shortcuts" -msgstr "" - -#: kallithea/templates/base/base.html:624 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 #, fuzzy msgid "Inherit defaults" msgstr "Repozytoria domyślne" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "Utwórz repozytorium" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 msgid "Select this option to allow repository creation for this user" msgstr "" "Wybierz tę opcję, aby umożliwić stworzenie repozytorium dla tego " "użytkownika" -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "Tworzenie grup użytkowników" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "" "Wybierz tę opcję, aby umożliwić utworzenie grupy użytkowników dla tego " "użytkownika" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "Rozwidlenie repozytorium" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "" "Wybierz tę opcję, aby umożliwić rozwidlania repozytorium dla tego " "użytkownika" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "Wyświetl" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "Nie ma jeszcze ustawionych uprawnień" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "Uprawnienia" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "Edycja Uprawnień" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 +#: kallithea/templates/base/root.html:25 +#: kallithea/tests/data/templates/base/root.html.py:85 #, fuzzy msgid "Add Another Comment" msgstr "Dodaj kolejny komentarz" -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 +#: kallithea/templates/base/root.html:26 +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 msgid "Stop following this repository" msgstr "Zakończyć obserwację tego repozytorium" -#: kallithea/templates/base/root.html:24 +#: kallithea/templates/base/root.html:27 +#: kallithea/tests/data/templates/base/root.html.py:89 msgid "Start following this repository" msgstr "Zacznij obserwację tego repozytorium" -#: kallithea/templates/base/root.html:25 +#: kallithea/templates/base/root.html:28 +#: kallithea/tests/data/templates/base/root.html.py:91 msgid "Group" msgstr "Grupa" -#: kallithea/templates/base/root.html:26 +#: kallithea/templates/base/root.html:29 +#: kallithea/tests/data/templates/base/root.html.py:93 msgid "members" msgstr "użytkownik" -#: kallithea/templates/base/root.html:27 +#: kallithea/templates/base/root.html:30 +#: kallithea/tests/data/templates/base/root.html.py:95 msgid "Loading ..." msgstr "Ładuję..." -#: kallithea/templates/base/root.html:28 +#: kallithea/templates/base/root.html:31 +#: kallithea/tests/data/templates/base/root.html.py:97 msgid "loading ..." msgstr "ładuję ..." -#: kallithea/templates/base/root.html:29 +#: kallithea/templates/base/root.html:32 +#: kallithea/tests/data/templates/base/root.html.py:99 msgid "Search truncated" msgstr "Szukaj obcięte" -#: kallithea/templates/base/root.html:30 +#: kallithea/templates/base/root.html:33 +#: kallithea/tests/data/templates/base/root.html.py:101 msgid "No matching files" msgstr "Nie ma plików pasujących" -#: kallithea/templates/base/root.html:31 +#: kallithea/templates/base/root.html:34 +#: kallithea/tests/data/templates/base/root.html.py:103 #, fuzzy msgid "Open New Pull Request from {0}" msgstr "Komentarz połączenia gałęzi %s" -#: kallithea/templates/base/root.html:32 +#: kallithea/templates/base/root.html:35 +#: kallithea/tests/data/templates/base/root.html.py:105 msgid "Open New Pull Request for {0} → {1}" msgstr "" -#: kallithea/templates/base/root.html:33 +#: kallithea/templates/base/root.html:36 +#: kallithea/tests/data/templates/base/root.html.py:107 #, fuzzy msgid "Show Selected Changesets {0} → {1}" msgstr "Pokaż wybrane zmiany __S -> __E" -#: kallithea/templates/base/root.html:34 +#: kallithea/templates/base/root.html:37 +#: kallithea/tests/data/templates/base/root.html.py:109 #, fuzzy msgid "Selection Link" msgstr "Wybór linku" -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/base/root.html:38 +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 #, fuzzy msgid "Collapse Diff" msgstr "Pliki różnic" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:39 +#: kallithea/tests/data/templates/base/root.html.py:113 #, fuzzy msgid "Expand Diff" msgstr "poprawka różnic" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:40 +#: kallithea/tests/data/templates/base/root.html.py:115 msgid "Failed to revoke permission" msgstr "Nie udało się cofnąć uprawnienia" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 #, fuzzy msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "potwierdzić odwołanie pozwolenie na {0}: {1} ?" -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/base/root.html:42 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "Wybrane zmiany" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 #, fuzzy msgid "Specify changeset" msgstr "Wybrane zmiany" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "%s Zakładki" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "Autor" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "Rewizja" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "%s Gałęzie" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "Kliknij, aby posortować rosnąco" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "Kliknij, aby posortować malejąco" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "Nie znaleziono rekordów." + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "Błąd danych." + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." +msgstr "Wczytywanie..." #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "%s Dziennik zmian" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" @@ -4863,212 +5107,291 @@ msgstr[1] "pokazano %d z %d rewizji" msgstr[2] "pokazano %d z %d rewizji" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "Wyczyść zaznaczenie" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 #, fuzzy msgid "Go to tip of repository" msgstr "Potwierdź blokowanie repozytorium" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "porównaj gałęzie %s" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, fuzzy, python-format msgid "Compare fork with parent repository (%s)" msgstr "porównaj gałęzie %s" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 #, fuzzy msgid "Branch filter:" msgstr "filtr" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 #, fuzzy, python-format -#| msgid "" "Changeset status: %s\n" "Click to open associated pull request %s" msgid "" "Changeset status: %s by %s\n" "Click to open associated pull request %s" msgstr "Status grupy zmian: %s⏎ Kliknij, aby otworzyć prośby pobrania #%s" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/changelog/changelog_summary_data.html:24 +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 #, fuzzy, python-format -#| msgid "Changeset status: %s" msgid "Changeset status: %s by %s" msgstr "Status grupy zmian: %s" +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 +msgid "Expand commit message" +msgstr "" + #: kallithea/templates/changelog/changelog.html:116 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:125 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "Komentarze Grupy zmian" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:57 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "Zakładki %s" -#: kallithea/templates/changelog/changelog.html:141 -#: kallithea/templates/changelog/changelog_summary_data.html:63 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#: kallithea/templates/compare/compare_cs.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:203 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "Tagi %s" -#: kallithea/templates/changelog/changelog.html:146 -#: kallithea/templates/changelog/changelog_summary_data.html:68 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "Gałęzie %s" -#: kallithea/templates/changelog/changelog.html:311 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "Nie ma jeszcze zmian" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "Usunięto" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "Zmiana" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:47 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "Dodana" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "Zarażone pliki %s" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "Rewizja" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "Ostatnia zmiana" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "Autor" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "Gałąź/Etykieta" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "Dodaj lub prześlij pliki bezpośrednio przez stronę" -#: kallithea/templates/changelog/changelog_summary_data.html:87 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:93 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 #, fuzzy msgid "Push new repository" msgstr "Wyślij zmiany do nowego repo" -#: kallithea/templates/changelog/changelog_summary_data.html:101 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "Istniejące repozytorium?" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "%s Grupy zmian" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:39 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "Status grupy zmian" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "Raw różnic" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "Poprawka różnic" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:75 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "Pobierz różnice" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 #, fuzzy msgid "Merge" msgstr "połącz" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 #, fuzzy msgid "Grafted from:" msgstr "Utworzono" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 #, fuzzy msgid "Replaced by:" msgstr "utworzono" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 #, fuzzy msgid "Preceded by:" msgstr "utworzono" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:329 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -5076,9 +5399,12 @@ msgstr[1] "%s pliki zostały zmienione" msgstr[2] "%s plików zostało zmienionych" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:62 -#: kallithea/templates/pullrequests/pullrequest_show.html:331 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -5086,51 +5412,65 @@ msgstr[1] "%s plików zostało zmienionych z %s inercjami i %s usunięciami" msgstr[2] "%s plików zostało zmienionych z %s inercjami i %s usunięciami" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 #, fuzzy msgid "Show full diff anyway" msgstr "Pokaż pełną historię" -#: kallithea/templates/changeset/changeset.html:231 -#: kallithea/templates/changeset/changeset.html:268 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 #, fuzzy msgid "No revisions" msgstr "rewizja" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 #, fuzzy msgid "on pull request" msgstr "Komentarz połączenia gałęzi %s" -#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 #, fuzzy msgid "No title" msgstr "nowy plik" -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 #, fuzzy msgid "on this changeset" msgstr "Brak zestawienia zmian" -#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 #, fuzzy msgid "Delete comment?" msgstr "%d komentarz" -#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 #, fuzzy msgid "Status change" msgstr "Ostatnia aktywność" -#: kallithea/templates/changeset/changeset_file_comment.html:59 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 #, fuzzy msgid "Commenting on line." msgstr "Komentując linię {1}." -#: kallithea/templates/changeset/changeset_file_comment.html:60 +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 #, fuzzy msgid "" "Comments are in plain text. Use @username inside this text to notify " @@ -5139,52 +5479,64 @@ "Użyj @username wewnątrz tego tekstu, aby wysłać powiadomienie do " "użytkownika strony" -#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 #, fuzzy msgid "Set changeset status" msgstr "Zmiana statusu grupy zmian" -#: kallithea/templates/changeset/changeset_file_comment.html:69 +#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 msgid "Vote for pull request status" msgstr "Zagłosuj na żądanie na grupę zmian" -#: kallithea/templates/changeset/changeset_file_comment.html:75 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 #, fuzzy msgid "No change" msgstr "Bez zmian" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 #, fuzzy msgid "Finish pull request" msgstr "Komentarz połączenia gałęzi %s" -#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 #, fuzzy msgid "Close" msgstr "(zamknięty)" -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 #, fuzzy msgid "Submitting ..." msgstr "Przesyłanie..." -#: kallithea/templates/changeset/changeset_file_comment.html:104 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "Komentarz" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "Musisz być zalogowany żeby komentarz." -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "Zaloguj się teraz" -#: kallithea/templates/changeset/changeset_file_comment.html:116 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "Ukryj" -#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -5192,7 +5544,8 @@ msgstr[1] "%d komentarzy" msgstr[2] "%d komentarzy" -#: kallithea/templates/changeset/changeset_file_comment.html:129 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, fuzzy, python-format msgid "%d inline" msgid_plural "%d inline" @@ -5200,7 +5553,8 @@ msgstr[1] "(%d linii)" msgstr[2] "(%d linii)" -#: kallithea/templates/changeset/changeset_file_comment.html:130 +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 #, fuzzy, python-format msgid "%d general" msgid_plural "%d general" @@ -5209,114 +5563,175 @@ msgstr[2] "" #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "%s Zestawienie zmian" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "Status grupy zmian: %s" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "Pliki naruszone" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "plik usunięty" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "Ostatnio modyfikowany" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 #, fuzzy msgid "Deleted" msgstr "usuń" -#: kallithea/templates/changeset/diff_block.html:57 +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 #, fuzzy msgid "Renamed" msgstr "zmień nazwę" -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Nieznana wersja %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Brak nazwy pliku" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "plik dodany" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "Pokaż pełną edycję tego pliku" -#: kallithea/templates/changeset/diff_block.html:69 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "Pokaż pełną listę zmian i różnic obok siebie" -#: kallithea/templates/changeset/diff_block.html:83 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "Pokaż online komentarz" #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "Brak zestawienia zmian" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "Przodek" - -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "Status grupy zmian: %s" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +#, fuzzy +#| msgid "Common ancestor" +msgid "Merge Ancestor" +msgstr "Skomentuj grupę zmian" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:85 +#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 #, fuzzy msgid "Show merge diff" msgstr "Pokaż pełną historię" -#: kallithea/templates/compare/compare_cs.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:321 -#, fuzzy -msgid "Common ancestor" -msgstr "Skomentuj grupę zmian" - -#: kallithea/templates/compare/compare_cs.html:99 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:107 +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 #, fuzzy msgid "is" msgstr "Gist" -#: kallithea/templates/compare/compare_cs.html:108 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, fuzzy, python-format msgid "%s changesets" msgstr "%s Zestawienie zmian" -#: kallithea/templates/compare/compare_cs.html:109 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 #, fuzzy msgid "behind" msgstr "Indeksuj ponownie" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "%s Porównaj" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "" #: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "" #: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5324,117 +5739,189 @@ msgstr[1] "Pokaż %s komentarze" msgstr[2] "Pokaż %s komentarze" -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "Pokaż pełną historię" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "Publiczne repozytorium" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "Nie ma jeszcze zestawienia zmian" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "Subskrybuj %s kanał rss" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "Subskrybuj %s kanał atom" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "%(user)s skomentował zatwierdzenie %(when)s" + +#: kallithea/templates/email_templates/changeset_comment.html:4 #, fuzzy, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "Status zestawienia zmian został zmieniony na" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Comment on Changeset \"%s\"" +msgstr "%(user)s skomentował zatwierdzenie %(when)s" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset flow" +msgid "Changeset on" +msgstr "Przepływ zestawienia zmian" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "gałąź" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Ostatnia aktywność" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "Repository has been locked" +msgid "The pull request has been closed." +msgstr "Repozytorium nie jest zablokowane" + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "Witaj %s" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 #, fuzzy msgid "We have received a request to reset the password for your account." msgstr "Otrzymaliśmy prośbę o utworzenie nowego hasła do twojego konta." -#: kallithea/templates/email_templates/password_reset.html:8 +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 msgid "" "This account is however managed outside this system and the password " "cannot be changed here." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:13 +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 +#: kallithea/templates/email_templates/pull_request.html:4 #, fuzzy, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, fuzzy, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#| msgid "[commented] on pull request for" +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "[komentarz] wniosek o połączenie gałęzi" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "on pull request" +msgid "Pull request from" +msgstr "Komentarz połączenia gałęzi %s" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +#, fuzzy +#| msgid "Date" +msgid "at" +msgstr "Data" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, fuzzy, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -#, fuzzy -msgid "The comment closed the pull request with status" -msgstr "%s skomentował nowe połączenie gałęzi \"%s\"" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -#, fuzzy -msgid "The comment was made with status" -msgstr "Wniosek połączenia został zamknięty ze statusem" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "Zobacz tego użytkownika tutaj" +#| msgid "%(user)s commented on pull request %(age)s" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "%(user)s skomentował nowe połączenie gałęzi w %(when)s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s from %s#%s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "Połączonych gałęzi #%s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "[komentarz] wniosek o połączenie gałęzi" + +#: kallithea/templates/email_templates/registration.html:22 +#, fuzzy +#| msgid "Group name" +msgid "Full Name" +msgstr "Nazwa grupy" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5452,85 +5939,107 @@ msgstr "%s Pliki różnic" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "Pliki %s" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "Pliki %s" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "Położenie" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "lub" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 +#: kallithea/tests/data/templates/files/files_add.html.py:241 #, fuzzy msgid "New file type" msgstr "nowy plik" -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 #, fuzzy msgid "Commit Changes" msgstr "Zatwierdź zmiany" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "poprzednia wersja" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "następna wersja" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "Obserwuj aktualną gałąź" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "Wczytywanie listy plików..." -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 msgid "Size" msgstr "Rozmiar" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 msgid "Last Revision" msgstr "Rewizja" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 #, fuzzy msgid "Last Modified" msgstr "Ostatnio modyfikowany" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 #, fuzzy msgid "Last Committer" msgstr "Autor" @@ -5541,7 +6050,7 @@ msgstr "%s Usuń Plik" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "Usuń plik" @@ -5554,25 +6063,24 @@ msgid "Edit file" msgstr "Edytuj plik" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "Źródło" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "Edycja pliku" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" @@ -5580,89 +6088,110 @@ msgstr[1] "%s autorzy" msgstr[2] "%s autorzy" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "Pokaż źródło" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" - -#: kallithea/templates/files/files_source.html:41 +#: kallithea/templates/files/files_source.html:34 +#, fuzzy, python-format +#| msgid "Deleted branch: %s" +msgid "Edit on Branch: %s" +msgstr "Usunięta gałąź: %s" + +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 msgid "Editing binary files not allowed" msgstr "Edycja plików binarnych jest zabroniona" -#: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 msgid "Editing files allowed only when on branch head revision" msgstr "" "Edycja plików dozwolona tylko wtedy, gdy rewizja jest w trakcie rewizji " "głównej gałęzi" -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/files/files_source.html:41 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "Plik binarny (%s)" -#: kallithea/templates/files/files_source.html:74 +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 #, fuzzy msgid "File is too big to display." msgstr "Plik jest za duży do wyświetlenia" -#: kallithea/templates/files/files_source.html:76 +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 #, fuzzy msgid "Show full annotation anyway." msgstr "Pokaż pełną historię" -#: kallithea/templates/files/files_source.html:78 +#: kallithea/templates/files/files_source.html:73 +#: kallithea/tests/data/templates/files/files_source.html.py:133 #, fuzzy msgid "Show as raw." msgstr "wyświetl jako raw" #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "adnotacja" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "Wróć" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "Brak plików w danej ścieżce" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "Obserwatorzy %s" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "Obserwuje" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "Rozpoczęto obserwację -" @@ -5671,71 +6200,81 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "Nazwa rozgałęzienia" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 #, fuzzy msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "Wersja domyślna dla plików stronicowania, pobierania plików, readme" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "Prywatny" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "Skopiuj uprawnienia" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "Skopiuj zezwolenia z rozwidlenia repozytorium" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "Aktualizuj po klonowaniu" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "Sprawdź źródło po wykonaniu klonowania" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "Gałąź %s" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "Gałęzie" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "Rozgałęziony" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "Nie ma jeszcze gałęzi" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 msgid "ATOM journal feed" msgstr "Dziennik kanału ATOM" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "Dziennik kanału RSS" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "Moje Repozytoria" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "Brak wpisów jeszcze" @@ -5749,35 +6288,46 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 #, fuzzy msgid "New Pull Request" msgstr "Nowa prośba o połączenie gałęzi" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "Tytuł" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "Napisz krótki opis tego tego połączenia gałęzi" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "Przepływ zestawienia zmian" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "Repozytorium git" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "Repozytorium docelowe" @@ -5814,7 +6364,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "Zamknięte" @@ -5833,34 +6385,42 @@ msgstr "Potwierdź usunięcie połączenia gałęzi" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, fuzzy, python-format msgid "%s Pull Request %s" msgstr "%s Połączonych gałęzi #%s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, fuzzy, python-format msgid "Pull request %s from %s#%s" msgstr "Połączonych gałęzi #%s" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 #, fuzzy msgid "Summarize the changes" msgstr "Zatwierdź zmiany" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "Nie ma jeszcze recenzenta" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" @@ -5868,95 +6428,121 @@ msgstr[1] "%d recenzenci" msgstr[2] "%d recenzentów" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "Połączenie gałęzi zostało zweryfikowane przez wszystkich recenzentów" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 #, fuzzy msgid "There are no reviewers" msgstr "Nie ma jeszcze gałęzi" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 #, fuzzy msgid "on" msgstr "brak" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "Pobierz zmiany" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -#, fuzzy -msgid "Update" -msgstr "[zaktualizowany] użytkownik" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 +#, fuzzy +#| msgid "Registration" +msgid "Next iteration" +msgstr "Rejestracja" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:215 +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 msgid "" -"Pull requests do not change once created. Select a revision and save to " -"replace this pull request with a new one." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:224 +"Pull request iterations do not change content once created. Select a " +"revision and save to make a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +#, fuzzy +msgid "Cancel Changes" +msgstr "Ostatnia aktywność" + +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 #, fuzzy msgid "Pull Request Reviewers" msgstr "Recenzje wniosków połączenia gałęzi" -#: kallithea/templates/pullrequests/pullrequest_show.html:249 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 #, fuzzy msgid "Remove reviewer" msgstr "recenzent" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:269 +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 #, fuzzy msgid "Potential Reviewers" msgstr "Podgląd komentarza" -#: kallithea/templates/pullrequests/pullrequest_show.html:272 +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:295 -msgid "Save Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:296 -#, fuzzy -msgid "Save Updates as New Pull Request" -msgstr "Otwórz nową prośbę o połączenie gałęzi" - -#: kallithea/templates/pullrequests/pullrequest_show.html:297 -#, fuzzy -msgid "Cancel Changes" -msgstr "Ostatnia aktywność" - -#: kallithea/templates/pullrequests/pullrequest_show.html:307 +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 #, fuzzy msgid "Pull Request Content" msgstr "Wniosek połączenia zmienił status" +#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +#, fuzzy +msgid "Common ancestor" +msgstr "Skomentuj grupę zmian" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5972,249 +6558,475 @@ msgid "Pull Requests to '%s'" msgstr "Połączonych gałęzi #%s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 #, fuzzy msgid "Open New Pull Request" msgstr "Otwórz nową prośbę o połączenie gałęzi" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, fuzzy, python-format msgid "Show Pull Requests to %s" msgstr "Pokaż Prośby Pobrania %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, fuzzy, python-format msgid "Show Pull Requests from '%s'" msgstr "Pokaż Prośby Pobrania %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 #, fuzzy msgid "Pull Requests Created by Me" msgstr "Recenzje wniosków połączenia gałęzi" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +#, fuzzy +#| msgid "Pull Request Reviewers" +msgid "Pull Requests Needing My Review" +msgstr "Recenzje wniosków połączenia gałęzi" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 #, fuzzy msgid "Pull Requests I Participate In" msgstr "Biorę udział w" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 #, fuzzy msgid "Search in All Repositories" msgstr "Szukaj we wszystkich repozytoriach" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "Szukana fraza" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "Szukaj w" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "Zawartość pliku" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "Komunikaty" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "Nazwy plików" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "Brak uprawnień" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "%s Statystyki" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "%s ATOM" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "%s RSS" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "Włącz" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "Statystyki zebrane: " -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "pliki" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "Pokaż więcej" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 msgid "commits" msgstr "komunikaty" +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "pliki dodane" + +#: kallithea/templates/summary/statistics.html:390 +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" +msgstr "pliki zmienione" + #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "pliki dodane" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" -msgstr "pliki zmienione" +#: kallithea/tests/data/templates/summary/statistics.html.py:153 +msgid "files removed" +msgstr "pliki usunięte" #: kallithea/templates/summary/statistics.html:393 -msgid "files removed" -msgstr "pliki usunięte" +#: kallithea/tests/data/templates/summary/statistics.html.py:155 +msgid "commit" +msgstr "komunikaty" + +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 +msgid "file added" +msgstr "plik dodany" #: kallithea/templates/summary/statistics.html:395 -msgid "commit" -msgstr "komunikaty" +#: kallithea/tests/data/templates/summary/statistics.html.py:159 +msgid "file changed" +msgstr "plik zmieniony" #: kallithea/templates/summary/statistics.html:396 -msgid "file added" -msgstr "plik dodany" - -#: kallithea/templates/summary/statistics.html:397 -msgid "file changed" -msgstr "plik zmieniony" - -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "plik usunięty" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "Podsumowanie %s" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "Repozytorium zablokowane przez %s" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "Repozytorium odblokowane" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "Gałąź z" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "Klonuj z" -#: kallithea/templates/summary/summary.html:72 -#, fuzzy -msgid "Clone URL" -msgstr "Url klonowania" - -#: kallithea/templates/summary/summary.html:78 -msgid "Show by Name" -msgstr "Pokaż nazwę" - -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 msgid "Show by ID" msgstr "Pokaż ID" -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:72 +#: kallithea/tests/data/templates/summary/summary.html.py:143 +msgid "Show by Name" +msgstr "Pokaż nazwę" + +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "Statystyki" +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 +msgid "Download" +msgstr "Pobierz" + +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 +msgid "There are no downloads yet" +msgstr "Nie pobrano jeszcze plików" + +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 +msgid "Downloads are disabled for this repository" +msgstr "Pliki do pobrania są zostały wyłączone dla tego repozytorium" + #: kallithea/templates/summary/summary.html:108 -msgid "Download" -msgstr "Pobierz" +#: kallithea/tests/data/templates/summary/summary.html.py:190 +msgid "Download as zip" +msgstr "Pobierz jako zip" #: kallithea/templates/summary/summary.html:112 -msgid "There are no downloads yet" -msgstr "Nie pobrano jeszcze plików" +#: kallithea/tests/data/templates/summary/summary.html.py:194 +msgid "Check this to download archive with subrepos" +msgstr "Zaznacz tu żeby pobrać archiwum z subrepozytorium" #: kallithea/templates/summary/summary.html:114 -msgid "Downloads are disabled for this repository" -msgstr "Pliki do pobrania są zostały wyłączone dla tego repozytorium" - -#: kallithea/templates/summary/summary.html:120 -msgid "Download as zip" -msgstr "Pobierz jako zip" - -#: kallithea/templates/summary/summary.html:125 -msgid "Check this to download archive with subrepos" -msgstr "Zaznacz tu żeby pobrać archiwum z subrepozytorium" - -#: kallithea/templates/summary/summary.html:125 +#: kallithea/tests/data/templates/summary/summary.html.py:196 #, fuzzy msgid "With subrepos" msgstr "z subrepozytorium" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "Rozmiar Repozytorium" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "Kanał RSS" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 #, fuzzy msgid "Latest Changes" msgstr "Ostatnia aktywność" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 #, fuzzy msgid "Quick Start" msgstr "Szybki start" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "Pobierz %s jak %s" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "Etykiety pliku %s" - -#: kallithea/templates/tags/tags.html:26 -#, fuzzy -msgid "Compare Tags" -msgstr "Porównaj tagi" +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "Repozytorium" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "Nazwa Grupy" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "Zapamiętaj mnie" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "Zmiana awataru na" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "Używa" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "ponowne skanowanie opcji" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "www" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "Wymagaj ssl dla operacji vcs" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "" +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." +"\n" +" The following " +"variables are available:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "Pozycja panelu" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "" +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "szybki filtr..." + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "Nie pamiętasz hasła?" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "Przodek" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, fuzzy, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "Status zestawienia zmian został zmieniony na" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, fuzzy, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, fuzzy, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, fuzzy, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +#, fuzzy +msgid "The comment closed the pull request with status" +msgstr "%s skomentował nowe połączenie gałęzi \"%s\"" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +#, fuzzy +msgid "The comment was made with status" +msgstr "Wniosek połączenia został zamknięty ze statusem" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "Zobacz tego użytkownika tutaj" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" +msgstr "Rozmiar Repozytorium" #~ msgid "increase diff context to %(num)s lines" #~ msgstr "" @@ -6255,9 +7067,6 @@ #~ msgid "No Files" #~ msgstr "Brak Plików" -#~ msgid "" -#~ msgstr "" - #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "Nazwa użytkownika \"%(username)s\" jest zabroniona" @@ -6510,3 +7319,223 @@ #~ msgid "New file mode" #~ msgstr "Nowy tryb pliku" +#~ msgid "Missing changesets since the previous pull request:" +#~ msgstr "" + +#~ msgid "New changesets on %s %s since the previous pull request:" +#~ msgstr "" + +#~ msgid "Ancestor didn't change - show diff since previous version:" +#~ msgstr "" + +#~ msgid "" +#~ "This pull request is based on " +#~ "another %s revision and there is " +#~ "no simple diff." +#~ msgstr "" + +#~ msgid "No changes found on %s %s since previous version." +#~ msgstr "" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "" + +#~ msgid "The following changes are available on %s:" +#~ msgstr "" + +#~ msgid "No changesets found for updating this pull request." +#~ msgstr "" + +#~ msgid "Git pull requests don't support updates yet." +#~ msgstr "" + +#~ msgid "Closing." +#~ msgstr "Zamknięcie." + +#~ msgid "Repository no access" +#~ msgstr "Brak dostępu do repozytorium" + +#~ msgid "Repository read access" +#~ msgstr "Repozytorium do odczytu" + +#~ msgid "Repository write access" +#~ msgstr "Repozytorium do zapisu" + +#~ msgid "Repository admin access" +#~ msgstr "Administracja dostępu do repozytorium" + +#~ msgid "Repository Group no access" +#~ msgstr "Grupy repozytoriów brak dostępu" + +#~ msgid "Repository Group read access" +#~ msgstr "Grupy repozytoriów dostęp do odczytu" + +#~ msgid "Repository Group write access" +#~ msgstr "Grupy repozytoriów dostęp do zapisu" + +#~ msgid "Repository Group admin access" +#~ msgstr "Repozytoria Grupy dostęp administratora" + +#~ msgid "Repository creation disabled" +#~ msgstr "Tworzenie repozytorium jest wyłączone" + +#~ msgid "Repository creation enabled" +#~ msgstr "Tworzenie repozytorium jest włączone" + +#~ msgid "Repository forking disabled" +#~ msgstr "Rozwidlenie repozytorium wyłączone" + +#~ msgid "Repository forking enabled" +#~ msgstr "Rozwidlenie repozytorium włączone" + +#~ msgid "Register disabled" +#~ msgstr "Rejestracja wyłączona" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" + +#~ msgid "Not Reviewed" +#~ msgstr "Brak Korekty" + +#~ msgid "Rejected" +#~ msgstr "Odrzucono" + +#~ msgid "Under Review" +#~ msgstr "Objęty Przeglądem" + +#~ msgid "Repository group no access" +#~ msgstr "Grupy repozytoriów brak dostępu" + +#~ msgid "Repository group read access" +#~ msgstr "Grupy repozytoriów dostęp do odczytu" + +#~ msgid "Repository group write access" +#~ msgstr "Grupy repozytoriów dostęp do zapisu" + +#~ msgid "Repository group admin access" +#~ msgstr "Repozytoria Grupy dostęp administratora" + +#~ msgid "User group no access" +#~ msgstr "Ta grupa użytkowników nie ma dostępu" + +#~ msgid "User group read access" +#~ msgstr "Dostęp do grupy parametrów użytkownika" + +#~ msgid "User group write access" +#~ msgstr "Ta grupa użytkowników ma prawo do zapisu" + +#~ msgid "User group admin access" +#~ msgstr "Ta grupa użytkowników ma uprawnienia administratora" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "Tworzenie grup repozytoriów wyłączone" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "Tworzenie grup repozytoriów włączone" + +#~ msgid "User Group creation disabled" +#~ msgstr "Tworzenie grup użytkowników wyłączone" + +#~ msgid "User Group creation enabled" +#~ msgstr "Tworzenie grup użytkowników właczone" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "Rejestracja użytkownika z ręczną aktywacją konta" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" + +#~ msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s: %(pr_title)s" + +#~ msgid "repositories" +#~ msgstr "repozytoria" + +#~ msgid "No repositories found." +#~ msgstr "Nie znaleziono repozytorium." + +#~ msgid "There are no branches yet" +#~ msgstr "Nie ma jeszcze gałęzi" + +#~ msgid "There are no tags yet" +#~ msgstr "Nie ma jeszcze tagów" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "Nie ma jeszcze zakładek" + +#~ msgid "Analytics HTML block" +#~ msgstr "" + +#~ msgid "" +#~ "HTML with JavaScript for web analytics" +#~ " systems like Google Analytics or " +#~ "Piwik. This will be added at the" +#~ " bottom of every page." +#~ msgstr "" + +#~ msgid "" +#~ "Schema of clone URL construction eg. " +#~ "'{scheme}://{user}@{netloc}/{repo}'.\n" +#~ " The " +#~ "following variables are available:\n" +#~ " {scheme}" +#~ " 'http' or 'https' sent from running" +#~ " Kallithea server,\n" +#~ " {user}" +#~ " current user username,\n" +#~ " {netloc}" +#~ " network location/server host of running" +#~ " Kallithea server,\n" +#~ " {repo}" +#~ " full repository name,\n" +#~ " {repoid}" +#~ " ID of repository, can be used " +#~ "to contruct clone-by-id" +#~ msgstr "" + +#~ msgid "enabled" +#~ msgstr "" + +#~ msgid "disabled" +#~ msgstr "" + +#~ msgid "%s Bookmarks" +#~ msgstr "%s Zakładki" + +#~ msgid "Compare Bookmarks" +#~ msgstr "" + +#~ msgid "%s Branches" +#~ msgstr "%s Gałęzie" + +#~ msgid "Compare Branches" +#~ msgstr "" + +#~ msgid "Editing file" +#~ msgstr "Edycja pliku" + +#~ msgid "Update" +#~ msgstr "[zaktualizowany] użytkownik" + +#~ msgid "" +#~ "Pull requests do not change once " +#~ "created. Select a revision and save " +#~ "to replace this pull request with " +#~ "a new one." +#~ msgstr "" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "Otwórz nową prośbę o połączenie gałęzi" + +#~ msgid "%s Tags" +#~ msgstr "Etykiety pliku %s" + +#~ msgid "Compare Tags" +#~ msgstr "Porównaj tagi" + diff -r a48802bf7134 -r 880e2f07651b kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Thu Jul 27 03:02:37 2017 +0200 +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Thu Jul 27 14:26:14 2017 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2016-03-14 16:51+0100\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: marcinkuzminski \n" "Language-Team: Portuguese (Brazil) " @@ -18,82 +18,101 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: kallithea/controllers/changelog.py:85 -#: kallithea/controllers/pullrequests.py:240 kallithea/lib/base.py:515 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "Não há nenhum changeset ainda" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "Nenhum" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:198 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "(fechado)" -#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "Mostrar espaços em branco" -#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 msgid "Ignore whitespace" msgstr "Ignorar espaços em branco" -#: kallithea/controllers/changeset.py:168 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:744 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "Confirme para travar repositório" + +#: kallithea/controllers/compare.py:73 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 #, fuzzy msgid "No response" msgstr "revisões" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" "A requisição não pôde ser compreendida pelo servidor devido à sintaxe mal" " formada." -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Acesso não autorizado ao recurso" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "Você não tem permissão para ver esta página" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "O recurso não pôde ser encontrado" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -101,379 +120,393 @@ "O servidor encontrou uma condição inesperada que o impediu de satisfazer " "a requisição." -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "Modificações no repositório %s" - -#: kallithea/controllers/feed.py:56 -#, python-format -msgid "%s %s feed" -msgstr "%s - feed %s" - -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 msgid "Changeset was too big and was cut off..." msgstr "Conjunto de mudanças era grande demais e foi cortado..." -#: kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:84 #, python-format msgid "%s committed on %s" msgstr "%s commitados em %s" -#: kallithea/controllers/files.py:92 -msgid "Click here to add new file" -msgstr "Clique aqui para adicionar um novo arquivo" +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 +#, python-format +msgid "%s %s feed" +msgstr "%s - feed %s" + +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 +#, python-format +msgid "Changes on %s repository" +msgstr "Modificações no repositório %s" #: kallithea/controllers/files.py:93 +msgid "Click here to add new file" +msgstr "Clique aqui para adicionar um novo arquivo" + +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:195 +#: kallithea/controllers/files.py:191 #, fuzzy, python-format msgid "%s at %s" msgstr "em %s e %s" -#: kallithea/controllers/files.py:307 kallithea/controllers/files.py:367 -#: kallithea/controllers/files.py:434 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Este repositório foi travado por %s em %s" -#: kallithea/controllers/files.py:319 +#: kallithea/controllers/files.py:309 #, fuzzy msgid "You can only delete files with revision being a valid branch" msgstr "Só é possível editar arquivos quando a revisão é um ramo válido" -#: kallithea/controllers/files.py:330 +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:352 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:356 kallithea/controllers/files.py:422 -#: kallithea/controllers/files.py:503 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "Ocorreu um erro ao realizar commit" -#: kallithea/controllers/files.py:379 +#: kallithea/controllers/files.py:369 #, fuzzy msgid "You can only edit files with revision being a valid branch" msgstr "Só é possível editar arquivos quando a revisão é um ramo válido" -#: kallithea/controllers/files.py:393 +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "Arquivo %s editado via Kallithea" -#: kallithea/controllers/files.py:409 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "Sem modificações" -#: kallithea/controllers/files.py:418 kallithea/controllers/files.py:492 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "Commit realizado com sucesso para %s" -#: kallithea/controllers/files.py:445 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "Arquivo adicionado via Kallithea" -#: kallithea/controllers/files.py:466 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "Nenhum conteúdo" -#: kallithea/controllers/files.py:470 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "Nenhum nome de arquivo" -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "O caminho deve ser relativo e não pode conter .." +#: kallithea/controllers/files.py:517 +msgid "Downloads disabled" +msgstr "Downloads desabilitados" + #: kallithea/controllers/files.py:528 -msgid "Downloads disabled" -msgstr "Downloads desabilitados" - -#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "Revisão desconhecida %s" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "Repositório vazio" -#: kallithea/controllers/files.py:543 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "Tipo de arquivo desconhecido" -#: kallithea/controllers/files.py:773 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "Conjuntos de mudanças" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "Ramos" -#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "Etiquetas" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "Ocorreu um erro ao bifurcar o repositório %s" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:94 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:479 -#: kallithea/templates/base/base.html:653 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "Repositórios" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "Ramo" -#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "Ramos Fechados" -#: kallithea/controllers/home.py:151 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:157 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "Diário Público" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:306 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "Diário" -#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:150 +#: kallithea/controllers/login.py:148 +#, python-format msgid "You have successfully registered with %s" msgstr "Você foi registrado no %s com sucesso" -#: kallithea/controllers/login.py:195 +#: kallithea/controllers/login.py:193 #, fuzzy msgid "A password reset confirmation code has been sent" msgstr "Seu link de reinicialização de senha foi enviado" -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:242 #, fuzzy msgid "Invalid password reset token" msgstr "Link para trocar senha" -#: kallithea/controllers/login.py:249 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:123 +#: kallithea/controllers/pullrequests.py:73 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:135 #, fuzzy, python-format msgid "%s (closed)" msgstr "" -#: kallithea/controllers/pullrequests.py:151 +#: kallithea/controllers/pullrequests.py:162 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 msgid "Changeset" msgstr "Conjunto de Mudanças" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:183 msgid "Special" msgstr "Especial" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:184 msgid "Peer branches" msgstr "Ramos pares" -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 msgid "Bookmarks" msgstr "Marcadores" -#: kallithea/controllers/pullrequests.py:312 +#: kallithea/controllers/pullrequests.py:326 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:358 -#: kallithea/controllers/pullrequests.py:505 -#, fuzzy -msgid "No description" -msgstr "Descrição" - -#: kallithea/controllers/pullrequests.py:365 -msgid "Successfully opened new pull request" -msgstr "Novo pull request criado com sucesso" - -#: kallithea/controllers/pullrequests.py:368 -#: kallithea/controllers/pullrequests.py:455 -#: kallithea/controllers/pullrequests.py:512 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:371 -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 #, fuzzy msgid "Error occurred while creating pull request" msgstr "Ocorreu um erro durante o envio do pull request" -#: kallithea/controllers/pullrequests.py:403 -msgid "Missing changesets since the previous pull request:" -msgstr "" +#: kallithea/controllers/pullrequests.py:358 +msgid "Successfully opened new pull request" +msgstr "Novo pull request criado com sucesso" + +#: kallithea/controllers/pullrequests.py:381 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" +msgstr "Revisores do pull request" #: kallithea/controllers/pullrequests.py:410 #, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:417 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:426 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:464 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:472 -#, fuzzy -msgid "Pull request update created" -msgstr "Revisores do pull request" - -#: kallithea/controllers/pullrequests.py:516 +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:414 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +#, fuzzy +msgid "No description" +msgstr "Descrição" + +#: kallithea/controllers/pullrequests.py:439 #, fuzzy msgid "Pull request updated" msgstr "Pull requests para %s" -#: kallithea/controllers/pullrequests.py:531 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "Pull request excluído com sucesso" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:491 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:599 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:617 -#, python-format -msgid "The following changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:621 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:629 +#: kallithea/controllers/pullrequests.py:552 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:556 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:635 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:571 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:573 +#, python-format +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 #, fuzzy msgid "No permission to change pull request status" msgstr "Vote para estado do pull request" -#: kallithea/controllers/pullrequests.py:738 +#: kallithea/controllers/pullrequests.py:676 #, fuzzy, python-format msgid "Successfully deleted pull request %s" msgstr "Pull request excluído com sucesso" -#: kallithea/controllers/pullrequests.py:748 -#, fuzzy -msgid "Closing." -msgstr "carregando ..." - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "Consulta de busca inválida. Tente usar aspas." -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "Não há índice onde pesquisa. Por favor execute o indexador whoosh" -#: kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 #, fuzzy msgid "An error occurred during search operation." msgstr "Ocorreu um erro durante essa operação de busca" -#: kallithea/controllers/summary.py:181 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 #, fuzzy msgid "No data ready yet" msgstr "Ainda não há dados carregados" -#: kallithea/controllers/summary.py:184 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "As estatísticas estão desabillitadas para este repositório" @@ -485,151 +518,155 @@ msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "Configurações padrão atualizadas com sucesso" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "Ocorreu um erro durnge a atualização dos padrões" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 #, fuzzy msgid "Forever" msgstr "para sempre" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "5 minutes" msgstr "cinco minutos" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 hour" msgstr "uma hora" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 msgid "1 day" msgstr "um dia" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "um mês" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:290 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "Ocorreu um erro durante a criação de um gist" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "Gist %s excluído" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:200 #, fuzzy msgid "Unmodified" msgstr "Última alteração" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "Você não pode editar esse usuário pois ele é crucial para toda a aplicação" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "Sua conta foi atualizada com sucesso" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:201 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "Ocorreu um erro durante a atualização do usuário %s" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "Email %s adicionado ao usuário" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "Ocorreu um erro durante o salvamento do email" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "Email removido do usuário" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:324 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "Ler" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" -msgstr "Gravar" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" +msgstr "Ler" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "Gravar" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -637,613 +674,647 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:336 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:344 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "Administrador" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "Desabilitado" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "Permitido com ativação manual de conta" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "Permitido com ativação automática de conta" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1705 -msgid "Manual activation of external account" -msgstr "Ativação manual de conta externa" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1706 -msgid "Automatic activation of external account" -msgstr "Ativação automática de conta externa" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "Desabilitado" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "Permitido com ativação manual de conta" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "Permitido com ativação automática de conta" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "Ativação manual de conta externa" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "Ativação automática de conta externa" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "Habilitado" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Ocorreu um erro durante a atualização das permissões" -#: kallithea/controllers/admin/repo_groups.py:187 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Ocorreu um erro durante a criação do grupo de repositórios %s" -#: kallithea/controllers/admin/repo_groups.py:192 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "Grupo de repositórios %s criado" -#: kallithea/controllers/admin/repo_groups.py:249 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "Grupo de repositórios %s atualizado" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:248 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Ocorreu um erro durante a atualização do grupo de repositórios %s" -#: kallithea/controllers/admin/repo_groups.py:283 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Esse grupo contém %s repositórios e não pode ser excluído" -#: kallithea/controllers/admin/repo_groups.py:290 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Este grupo contém %s subgrupos e não pode ser excluído" -#: kallithea/controllers/admin/repo_groups.py:296 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "Grupo de repositórios %s excluído" -#: kallithea/controllers/admin/repo_groups.py:301 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Ocorreu um erro durante a exclusão do grupo de repositórios %s" -#: kallithea/controllers/admin/repo_groups.py:404 -#: kallithea/controllers/admin/repo_groups.py:439 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "Você não pode revocar sua própria permissão de administrador" -#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "Permissões atualizadas do Grupo de Repositórios" -#: kallithea/controllers/admin/repo_groups.py:456 -#: kallithea/controllers/admin/repos.py:397 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "Ocorreu um erro durante a revocação das permissões" -#: kallithea/controllers/admin/repos.py:151 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "Erro ao criar repositório %s" -#: kallithea/controllers/admin/repos.py:212 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "Repositório %s criado de %s" -#: kallithea/controllers/admin/repos.py:221 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "Repositório %s bifurcado como %s" -#: kallithea/controllers/admin/repos.py:224 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "Repositório %s criado" -#: kallithea/controllers/admin/repos.py:261 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "Repositório %s atualizado com sucesso" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "Ocorreu um erro durante a atualização do repositório %s" -#: kallithea/controllers/admin/repos.py:309 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:312 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "%s bifurcações excluídas" -#: kallithea/controllers/admin/repos.py:317 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "Repositório %s excluído" -#: kallithea/controllers/admin/repos.py:320 +#: kallithea/controllers/admin/repos.py:289 #, fuzzy, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Nao é possível excluir %s pois ele ainda contém bifurcações vinculadas" -#: kallithea/controllers/admin/repos.py:325 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "Ocorreu um erro durante a exclusão de %s" -#: kallithea/controllers/admin/repos.py:373 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "Permissões do repositório atualizadas" -#: kallithea/controllers/admin/repos.py:429 -msgid "An error occurred during creation of field" +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, fuzzy, python-format +#| msgid "An error occurred during creation of field" +msgid "An error occurred during creation of field: %r" msgstr "Ocorreu um erro durante a criação do campo" -#: kallithea/controllers/admin/repos.py:443 +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "Ocorreu um erro durante a remoção do campo" -#: kallithea/controllers/admin/repos.py:459 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:490 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "Atualizada a visibilidade do repositório no diário público" -#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "Ocorreu um erro ao ajustar esse repositório no diário público" -#: kallithea/controllers/admin/repos.py:511 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "Nada" -#: kallithea/controllers/admin/repos.py:513 +#: kallithea/controllers/admin/repos.py:473 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Marcado repositório %s como bifurcação de %s" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:480 msgid "An error occurred during this operation" msgstr "Ocorreu um erro durante essa operação" -#: kallithea/controllers/admin/repos.py:536 -#: kallithea/controllers/admin/repos.py:563 +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 #, fuzzy msgid "Repository has been locked" msgstr "Repositório não está travado" -#: kallithea/controllers/admin/repos.py:539 -#: kallithea/controllers/admin/repos.py:560 +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 #, fuzzy msgid "Repository has been unlocked" msgstr "Repositório não está travado" -#: kallithea/controllers/admin/repos.py:542 -#: kallithea/controllers/admin/repos.py:567 +#: kallithea/controllers/admin/repos.py:502 +#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during unlocking" msgstr "Ocorreu um erro durante o destravamento" -#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:533 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:585 +#: kallithea/controllers/admin/repos.py:537 msgid "An error occurred during cache invalidation" msgstr "Ocorreu um erro ao invalidar o cache" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: kallithea/controllers/admin/repos.py:603 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "Ocorreu um erro ao realizar pull de localização remota" -#: kallithea/controllers/admin/repos.py:636 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "Ocorreu um erro ao excluir estatísticas de repositório" -#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "Configurações de VCS atualizadas" -#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:151 -#: kallithea/controllers/admin/settings.py:248 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "Ocorreu um erro durante a atualização das configurações da aplicação" -#: kallithea/controllers/admin/settings.py:187 +#: kallithea/controllers/admin/settings.py:174 #, fuzzy, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Repositórios varridos com sucesso adicionados: %s ; removidos: %s" -#: kallithea/controllers/admin/settings.py:244 +#: kallithea/controllers/admin/settings.py:189 +#, fuzzy, python-format +#| msgid "Invalidate cache for all repositories" +msgid "Invalidated %s repositories" +msgstr "Invalidar o cache para todos os repositórios" + +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "Configurações da aplicação atualizadas" -#: kallithea/controllers/admin/settings.py:301 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Configurações de visualização atualizadas" -#: kallithea/controllers/admin/settings.py:306 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "Ocorreu um erro durante a atualização das configurações de visualização" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:347 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:378 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "Adicionado novo gancho" -#: kallithea/controllers/admin/settings.py:392 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "Atualizados os ganchos" -#: kallithea/controllers/admin/settings.py:396 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "Ocorreu um erro durante a criação do hook" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "Tarefa de reindexação do whoosh agendada" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "Grupo de usuários %s criado" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Ocorreu um erro durante a criação do grupo de usuários %s" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "Grupo de usuários %s atualizado" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:208 #, python-format msgid "Error occurred during update of user group %s" msgstr "Ocorreu um erro durante a atualização do grupo de usuários %s" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:219 msgid "Successfully deleted user group" msgstr "Grupo de usuários excluído com sucesso" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:224 msgid "An error occurred during deletion of user group" msgstr "Ocorreu um erro durante a exclusão do grupo de usuários" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "O grupo destino não pode ser o mesmo" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "Permissões do Grupo de Usuários atualizadas" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "Permissões atualizadas" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "Ocorreu um erro durante o salvamento das permissões" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "Usuário %s criado" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "Ocorreu um erro durante a criação do usuário %s" -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "Usuário atualizado com sucesso" -#: kallithea/controllers/admin/users.py:217 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "Usuário excluído com sucesso" -#: kallithea/controllers/admin/users.py:222 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "Ocorreu um erro ao excluir o usuário" -#: kallithea/controllers/admin/users.py:235 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:462 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:468 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "Ocorreu um erro durante o salvamento do IP" -#: kallithea/controllers/admin/users.py:482 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:737 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "IP %s não permitido" -#: kallithea/lib/auth.py:750 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/auth.py:768 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:813 +#: kallithea/lib/auth.py:829 msgid "You need to be a registered user to perform this action" msgstr "Você precisa ser um usuário registrado para realizar essa ação" -#: kallithea/lib/auth.py:843 +#: kallithea/lib/auth.py:857 msgid "You need to be signed in to view this page" msgstr "Você precisa estar logado para ver essa página" -#: kallithea/lib/base.py:493 +#: kallithea/lib/base.py:449 +msgid "Invalid API key" +msgstr "" + +#: kallithea/lib/base.py:508 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:623 -msgid "Changeset not found" +#: kallithea/lib/base.py:617 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset for %s %s not found in %s" msgstr "Conjunto de alterações não encontrado" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "Arquivo binário" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Conjunto de mudanças é grande demais e foi cortado, use o menu de " "diferenças para ver as diferenças" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "Nenhuma alteração detectada" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "Excluído ramo: %s" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "Tag criada: %s" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:613 +#, fuzzy, python-format +#| msgid "Changeset not found" +msgid "Changeset %s not found" +msgstr "Conjunto de alterações não encontrado" + +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Ver todos os conjuntos de mudanças combinados %s->%s" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 #, fuzzy msgid "Compare view" msgstr "comparar exibir" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "e" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "%s mais" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "revisões" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, fuzzy, python-format msgid "Fork name %s" msgstr "nome da bifurcação %s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, fuzzy, python-format msgid "Pull request %s" msgstr "Pull request #%s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "repositório [excluído]" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 msgid "[created] repository" msgstr "repositório [criado]" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "repositório [criado] como uma bifurcação" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "repositório [bifurcado]" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "repositório [atualizado]" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "[baixado] archive do repositório" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "[excluir] repositório" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "usuário [criado]" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "usuário [atualizado]" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "[criado] grupo de usuários" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "[atualizado] grupo de usuários" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "[comentado] em revisão no repositório" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "[comentado] no pull request para" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "[fechado] pull request para" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "[realizado push] para" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "[commitado via Kallithea] no repositório" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "[pulled do remote] no repositório" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "[realizado pull] a partir de" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "[passou a seguir] o repositório" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr " e mais %s" -#: kallithea/lib/helpers.py:1128 -#: kallithea/templates/compare/compare_diff.html:71 -#: kallithea/templates/pullrequests/pullrequest_show.html:337 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "Nenhum arquivo" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "novo arquivo" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "excluir" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "renomear" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1469 +#: kallithea/lib/helpers.py:1230 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1254,748 +1325,403 @@ "renomeado a partir do sistema de arquivos. Por favor, execute a aplicação" " outra vez para varrer novamente por repositórios" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d ano" msgstr[1] "%d anos" -#: kallithea/lib/utils2.py:435 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mês" msgstr[1] "%d meses" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: kallithea/lib/utils2.py:437 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: kallithea/lib/utils2.py:439 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: kallithea/lib/utils2.py:455 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "em %s" -#: kallithea/lib/utils2.py:457 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "%s atrás" -#: kallithea/lib/utils2.py:459 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "em %s e %s" -#: kallithea/lib/utils2.py:462 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "%s e %s atrás" -#: kallithea/lib/utils2.py:465 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "agora há pouco" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "Nenhum acesso ao repositório" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "Acesso de leitura ao repositório" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "Acesso de escrita ao repositório" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "Acesso administrativo ao repositório" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "Nenhum acesso ao Grupo de Repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "Acesso de leitura ao Grupo de Repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "Acesso de escrita ao Grupo de Repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "Acesso administrativo ao Grupo de Repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1669 -msgid "Kallithea Administrator" -msgstr "Administrador do Kallithea" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "Criação de repositórios desabilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "Criação de repositórios habilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "Bifurcação de repositórios desabilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "Bifurcação de repositórios habilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "Registro desabilitado" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "Registro de novo usuário no Kallithea com ativação manual" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "Registro de novo usuário no Kallithea com auto-ativação" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "Não Revisado" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2237 -msgid "Approved" -msgstr "Aprovado" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2238 -msgid "Rejected" -msgstr "Rejeitado" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "Sob Revisão" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1518 -msgid "top level" -msgstr "nível superior" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "Sem acesso ao grupo de repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "Acesso de leitura ao grupo de repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "Acesso de escrita ao grupo de repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "Acesso administrativo ao grupo de repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "Sem acesso ao grupo de usuários" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "Acesso de leitura ao grupo de usuários" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "Acesso de escrita ao grupo de usuários" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "Acesso administrativo ao grupo de usuários" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "Criação de Grupo de Repositórios desatilibada" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "Criação de Grupo de Repositórios habilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "Criação de Grupo de Usuários desabilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "Criação de Grupo de Usuários habilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1701 -msgid "Registration disabled" -msgstr "Registro desatilitado" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "Registro de Usuário com ativação manual de conta" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "Registro de Usuário com ativação automática de conta" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1695 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1696 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "na linha %s" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "[Menção]" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "nível superior" + +#: kallithea/model/db.py:1715 +msgid "Kallithea Administrator" +msgstr "Administrador do Kallithea" + +#: kallithea/model/db.py:1717 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 +#: kallithea/model/db.py:1718 #, fuzzy msgid "Default user has read access to new repositories" msgstr "Acesso não autorizado ao recurso" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1719 #, fuzzy msgid "Default user has write access to new repositories" msgstr "Acesso não autorizado ao recurso" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1720 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1722 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 +#: kallithea/model/db.py:1723 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1724 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1725 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1727 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1728 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1729 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1730 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1732 #, fuzzy msgid "Only admins can create repository groups" msgstr "Grupo de repositórios %s criado" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1733 #, fuzzy msgid "Non-admins can create repository groups" msgstr "Grupo de repositórios %s criado" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1735 #, fuzzy msgid "Only admins can create user groups" msgstr "Criar grupos de usuários" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1736 #, fuzzy msgid "Non-admins can create user groups" msgstr "Criar grupos de usuários" -#: kallithea/model/db.py:1692 +#: kallithea/model/db.py:1738 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1693 +#: kallithea/model/db.py:1739 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1741 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1742 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1744 #, fuzzy msgid "Only admins can fork repositories" msgstr "Criar repositórios" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1745 #, fuzzy msgid "Non-admins can fork repositories" msgstr "Invalidar o cache para todos os repositórios" -#: kallithea/model/db.py:1702 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "Registro desatilitado" + +#: kallithea/model/db.py:1748 #, fuzzy msgid "User registration with manual account activation" msgstr "Registro de Usuário com ativação manual de conta" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1749 #, fuzzy msgid "User registration with automatic account activation" msgstr "Registro de Usuário com ativação automática de conta" -#: kallithea/model/db.py:2236 +#: kallithea/model/db.py:2276 #, fuzzy msgid "Not reviewed" msgstr "Não Revisado" -#: kallithea/model/db.py:2239 +#: kallithea/model/db.py:2277 #, fuzzy msgid "Under review" msgstr "Sob Revisão" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2278 +#, fuzzy +#| msgid "Approved" +msgid "Not approved" +msgstr "Aprovado" + +#: kallithea/model/db.py:2279 +msgid "Approved" +msgstr "Aprovado" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "Por favor entre um login" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Entre um valor com %(min)i caracteres ou mais" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "Por favor entre com uma senha" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "Entre com %(min)i caracteres ou mais" -#: kallithea/model/forms.py:165 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:240 #, fuzzy, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s comentou no changeset em %(when)s" -#: kallithea/model/notification.py:255 +#: kallithea/model/notification.py:241 #, fuzzy, python-format msgid "%(user)s sent message %(age)s" msgstr "%(user)s enviou mensagem em %(when)s" -#: kallithea/model/notification.py:256 +#: kallithea/model/notification.py:242 #, fuzzy, python-format msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s mencionou-o em %(when)s" -#: kallithea/model/notification.py:257 +#: kallithea/model/notification.py:243 #, fuzzy, python-format msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s registrou-se no Kallithea em %(when)s" -#: kallithea/model/notification.py:258 +#: kallithea/model/notification.py:244 #, fuzzy, python-format msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s abriu um novo pull request em %(when)s" -#: kallithea/model/notification.py:259 +#: kallithea/model/notification.py:245 #, fuzzy, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s comentou no pull request em %(when)s" -#: kallithea/model/notification.py:266 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s comentou no changeset em %(when)s" -#: kallithea/model/notification.py:267 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s enviou mensagem em %(when)s" -#: kallithea/model/notification.py:268 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s mencionou-o em %(when)s" -#: kallithea/model/notification.py:269 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s registrou-se no Kallithea em %(when)s" -#: kallithea/model/notification.py:270 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s abriu um novo pull request em %(when)s" -#: kallithea/model/notification.py:271 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s comentou no pull request em %(when)s" -#: kallithea/model/notification.py:302 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:288 +#, fuzzy, python-format +#| msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "[comentado] no pull request para" + +#: kallithea/model/notification.py:291 #, fuzzy, python-format msgid "New user %(new_username)s registered" msgstr "O username \"%(new_username)s\" não é válido" +#: kallithea/model/notification.py:293 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:307 -#, fuzzy, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "%(user)s solicita sua revisão no pull request $%(pr_id)s: %(pr_title)s" - -#: kallithea/model/notification.py:308 -#, fuzzy, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "[comentado] no pull request para" - -#: kallithea/model/notification.py:321 #, fuzzy msgid "Closing" msgstr "Usando" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, fuzzy, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "%(user)s solicita sua revisão no pull request $%(pr_id)s: %(pr_title)s" -#: kallithea/model/scm.py:708 +#: kallithea/model/pull_request.py:211 +#, fuzzy +#| msgid "Create Pull Request" +msgid "Cannot create empty pull request" +msgstr "Criar Pull Request" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +#, fuzzy +#| msgid "Confirm to delete this pull request" +msgid "You are not authorized to create the pull request" +msgstr "Confirme para excluir este pull request" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "tip mais recente" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "Novo registro de usuário" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 #, fuzzy msgid "You can't remove this user since it is crucial for the entire application" msgstr "" "Você não pode remover esse usuário, pois ele é crucial para toda a " "aplicação" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -2004,7 +1730,7 @@ "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. " "Troque os donos ou remova esses repositórios. %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" @@ -2013,7 +1739,7 @@ "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. " "Troque os donos ou remova esses repositórios. %s" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -2022,37 +1748,37 @@ "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. " "Troque os donos ou remova esses repositórios. %s" -#: kallithea/model/user.py:368 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "Link para trocar senha" -#: kallithea/model/user.py:418 +#: kallithea/model/user.py:413 #, fuzzy msgid "Password reset notification" msgstr "Link para trocar senha" -#: kallithea/model/user.py:419 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "O valor não pode ser uma lista vazia" -#: kallithea/model/validators.py:96 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "O username \\\"%(username)s\\\" já existe" -#: kallithea/model/validators.py:98 +#: kallithea/model/validators.py:75 #, fuzzy, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "O username \"%(username)s\" não é válido" -#: kallithea/model/validators.py:100 +#: kallithea/model/validators.py:77 #, fuzzy msgid "" "Username may only contain alphanumeric characters underscores, periods or" @@ -2061,25 +1787,25 @@ "Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, " "pontos e hífens e deve iniciar com caractere alfanumérico" -#: kallithea/model/validators.py:127 +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:134 +#: kallithea/model/validators.py:111 #, python-format msgid "Username %(username)s is not valid" msgstr "O username \"%(username)s\" não é válido" -#: kallithea/model/validators.py:154 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "Nome inválido de grupo de usuários" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:132 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "O grupo de usuários \"%(usergroup)s\" já existe" -#: kallithea/model/validators.py:157 +#: kallithea/model/validators.py:134 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -2088,107 +1814,107 @@ "underscores, pontos ou hífens, e deve começar om um caractere alfa-" "numérico" -#: kallithea/model/validators.py:197 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "Não é possível associar esse grupo como progenitor" -#: kallithea/model/validators.py:198 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "O grupo \\\"%(group_name)s\\\" já existe" -#: kallithea/model/validators.py:200 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Um repositório com o nome \"%(group_name)s\" já existe" -#: kallithea/model/validators.py:258 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "Caracteres inválidos (não-ascii) na senha" -#: kallithea/model/validators.py:273 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:289 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "Senhas não conferem" -#: kallithea/model/validators.py:304 +#: kallithea/model/validators.py:279 #, fuzzy msgid "Invalid username or password" msgstr "senha inválida" -#: kallithea/model/validators.py:335 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "Descompasso de Token" -#: kallithea/model/validators.py:351 +#: kallithea/model/validators.py:326 #, fuzzy, python-format msgid "Repository name %(repo)s is not allowed" msgstr "O nome de repositório %(repo)s não é permitido" -#: kallithea/model/validators.py:353 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Um repositório chamado %(repo)s já existe" -#: kallithea/model/validators.py:354 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Um repositório \"%(repo)s\" já existe no grupo \"%(group)s\"" -#: kallithea/model/validators.py:356 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Um Grupo de Repositórios chamado \"%(repo)s\" já existe" -#: kallithea/model/validators.py:470 +#: kallithea/model/validators.py:449 #, fuzzy msgid "Invalid repository URL" msgstr "repositório privado" -#: kallithea/model/validators.py:471 +#: kallithea/model/validators.py:450 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:496 +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "A bifurcação deve ser do mesmo tipo que o pai" -#: kallithea/model/validators.py:511 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "Você não tem permissão para criar um repositório neste grupo" -#: kallithea/model/validators.py:513 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "você não tem permissão para criar um repositório na raiz" -#: kallithea/model/validators.py:563 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "Você não tem permissão para criar um grupo neste local" -#: kallithea/model/validators.py:604 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "Este nome de usuário ou de grupo de usuários não é válido" -#: kallithea/model/validators.py:697 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "Esse não é um caminho válido" -#: kallithea/model/validators.py:714 +#: kallithea/model/validators.py:692 #, fuzzy msgid "This email address is already in use" msgstr "Esse endereço de e-mail já está tomado" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:712 #, fuzzy, python-format msgid "Email address \"%(email)s\" not found" msgstr "o e-mail \"%(email)s\" não existe." -#: kallithea/model/validators.py:771 +#: kallithea/model/validators.py:749 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -2196,283 +1922,270 @@ "O atributo de login LDAP do CN deve ser especificado - isto é o nome do " "atributo que é equivalente ao 'nome de usuário'" -#: kallithea/model/validators.py:783 +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Por favor, forneça um endereço válido IPv4 ou IPv6" -#: kallithea/model/validators.py:784 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "O tamanho da rede (bits) deve estar no intervalo 0-32 (não %(bits)r)" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "O nome da chave só pode conter letras, underscore, hífen ou dígitos" -#: kallithea/model/validators.py:831 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "O nome de arquivo não pode estar dentro de um diretório" -#: kallithea/model/validators.py:847 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "Painel de Controle" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "filtro rápido..." - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "repositórios" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "Você tem direitos de administrador neste grupo e pode editá-lo" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +#, fuzzy +#| msgid "Repository group" +msgid "Repository Group" +msgstr "Grupo de repositórios" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "Descrição" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "Nome" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "Repositório" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "Última Alteração" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" msgstr "Ponta" -#: kallithea/templates/index_base.html:132 +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:244 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "Dono" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "Clique para ordenar em ordem crescente" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "Clique para ordenar em ordem descrescente" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "Nenhum repositório encontrado." - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "Erro de dados." - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "Carregando..." - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:414 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "Entrar" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "Log in em %s" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "Nome de usuário" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "Senha" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "Lembre-se de mim" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "Esqueceu sua senha ?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "Não possui uma conta ?" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "Entrar" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "Senha Trocada" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 #, fuzzy, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 #, fuzzy msgid "Reset Your Password" msgstr "Esqueceu sua senha ?" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 #, fuzzy msgid "Send Password Reset Email" msgstr "Link para trocar senha" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 #, fuzzy msgid "" "A password reset link will be sent to the specified email address if it " @@ -2481,115 +2194,138 @@ "Link de reinicialização de senha será enviado ao endereço de e-mail " "correspondente" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 #, fuzzy msgid "New Password" msgstr "Nova senha" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 #, fuzzy msgid "Confirm New Password" msgstr "Sua nova senha" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "Inscrever-se" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "Repita a senha" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "Primeiro Nome" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "Último Nome" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "E-mail" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "Ainda não há ramos" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "Ainda não há etiquetas" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "Ainda não há marcadores" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 #, fuzzy msgid "Admin Journal" msgstr "Diário do administrador" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "filtro de diário..." #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 #, fuzzy msgid "Filter" msgstr "filtro" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, fuzzy, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2597,116 +2333,138 @@ msgstr[1] "%s entradas" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "Ação" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "Repositório" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "Data" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "A partir do IP" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "Ainda não há ações" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "Salvar" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 #, fuzzy msgid "Repository Defaults" msgstr "Padrões de repositórios" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "Tipo" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 msgid "Private repository" msgstr "Repositório privado" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -2714,34 +2472,40 @@ "Repositórios privados são visíveis somente por pessoas explicitamente " "adicionadas como colaboradores." -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 msgid "Enable statistics" msgstr "Habilitar estatísticas" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 msgid "Enable statistics window on summary page." msgstr "Habilitar janela de estatísticas na página de sumário." -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 msgid "Enable downloads" msgstr "Habilitar downloads" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 msgid "Enable download menu on summary page." msgstr "Habilitar menu de descarregar na página de sumário." -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 msgid "Enable locking" msgstr "Habilitar travas" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "Habilitar trava-por-pulling no repositório." @@ -2750,324 +2514,477 @@ msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "Descrição do gist ..." -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "Tempo de vida do Gist" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" msgstr "Expira" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 #, fuzzy msgid "Never" msgstr "nunca" -#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:147 -#: kallithea/templates/changeset/changeset_file_comment.html:105 +#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "Cancelar" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, fuzzy, python-format msgid "Private Gists for User %s" msgstr "Gists privados do usuário %s" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, fuzzy, python-format msgid "Public Gists for User %s" msgstr "Gists públicos do usuário %s" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "Gists Públicos" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "Criado" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "Não há nenhum gist ainda" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "Limpar" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "Gist" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "URL" +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:31 -#: kallithea/templates/changeset/changeset_file_comment.html:95 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "Excluir" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "Editar" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "Editar" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "criado" -#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "Mostrar original" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:431 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "Minha Conta" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 #, fuzzy msgid "Email Addresses" msgstr "Novo endereço de email" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 #, fuzzy msgid "Owned Repositories" msgstr "repositórios" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 #, fuzzy msgid "Watched Repositories" msgstr "Criar repositórios" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 #, fuzzy msgid "Show Permissions" msgstr "Copiar permissões" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, fuzzy, python-format msgid "Confirm to reset this API key: %s" msgstr "Confirme para excluir este IP: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 #, fuzzy msgid "Expired" msgstr "Expira" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, fuzzy, python-format msgid "Confirm to remove this API key: %s" msgstr "Confirme para excluir este IP: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 #, fuzzy msgid "Remove" msgstr "Removido" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 #, fuzzy msgid "New API key" msgstr "Próxima chave de campo" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "Adicionar" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "Confirme para excluir este email: %s" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "Novo endereço de email" @@ -3076,135 +2993,178 @@ msgid "Change Your Account Password" msgstr "Sua nova senha" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "Nova senha" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, fuzzy, python-format +#| msgid "Change your avatar at" +msgid "Change %s avatar at" msgstr "Altere o seu avatar em" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "Usando" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 #, fuzzy msgid "Repositories You Own" msgstr "Nenhum repositório encontrado." -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "Nenhum registro encontrado." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" +msgstr "Nome" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 #, fuzzy msgid "Repositories You are Watching" msgstr "Localização dos repositórios" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "Minhas Notificações" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "Todos" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "Comentários" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "Pull Requests" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 #, fuzzy msgid "Mark All Read" msgstr "Marcar tudo como lido" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +#, fuzzy +#| msgid "Mark All Read" +msgid "Mark as read" +msgstr "Marcar tudo como lido" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "Ainda não há notificações aqui" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 #, fuzzy msgid "Show Notification" msgstr "Mostrar notificação" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:430 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "Notificações" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 #, fuzzy msgid "Default Permissions" msgstr "Permissões padrão" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "Acesso anônimo" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " @@ -3214,24 +3174,30 @@ "permissão escolhida, note que todas as permissões padrão customizadas nos" " repositórios serão perdidas" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 #, fuzzy msgid "Apply to all existing repositories" msgstr "Repositório existente?" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 msgid "Permissions for the Default user on new repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 msgid "Repository group" msgstr "Grupo de repositórios" -#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " @@ -3241,21 +3207,26 @@ "modificadas para a permissão escolhida, note que todas as permissões " "padrão customizadas em grupos de repositórios serão perdidas" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 #, fuzzy msgid "Apply to all existing repository groups" msgstr "Grupo de repositórios %s atualizado" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "Grupo de usuários" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 #, fuzzy msgid "" "All default permissions on each user group will be reset to chosen " @@ -3266,108 +3237,137 @@ " as permissões escolhidas. Note que todas as permissões padrão " "customizadas nos repositórios serão perdidas" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 #, fuzzy msgid "Top level repository creation" msgstr "Criação de repositório" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 msgid "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 msgid "User group creation" msgstr "Criação de grupo de usuários" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "Bifurcação de repositório" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "Registro" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "Ativação de autenticação de conta externa" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, fuzzy, python-format msgid "Confirm to delete this IP address: %s" msgstr "Confirme para excluir este IP: %s" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 #, fuzzy msgid "All IP addresses are allowed." msgstr "Todos os endereços IP são permitidos" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "Novo endereço IP" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "Nome do grupo" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "Progenitor do grupo" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "" @@ -3376,31 +3376,42 @@ msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "Configurações" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "Permissões" @@ -3424,12 +3435,14 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "Criado em" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3440,8 +3453,30 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "Disabled" +msgid "Visible" +msgstr "Desabilitado" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "No response" +msgid "Add repos" +msgstr "revisões" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#, fuzzy +#| msgid "Add user group" +msgid "Add/Edit groups" +msgstr "Adicionar grupo de usuários" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 #, fuzzy msgid "User/User Group" @@ -3449,8 +3484,8 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy @@ -3459,36 +3494,36 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy msgid "Revoke" msgstr "revogar" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "Adicionar novo" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #, fuzzy msgid "Apply to children" msgstr "aplicar aos filhos" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" @@ -3496,75 +3531,87 @@ "Habilitar trava-por-pulling no grupo. Esta opção será aplicada a todos os" " outros grupos e repositórios dentro deles" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 #, fuzzy msgid "Remove this group" msgstr "Criar grupos de usuários" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 #, fuzzy msgid "Confirm to delete this group" msgstr "Confirme para excluir este grupo de usuário: %s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" +#, fuzzy, python-format +#| msgid "Repository group" +msgid "Repository group %s" +msgstr "Grupo de repositórios" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "Início" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "com" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 #, fuzzy msgid "Repository Groups Administration" msgstr "Administração de grupos de repositórios" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 #, fuzzy msgid "Number of Top-level Repositories" msgstr "Número de repositórios de nível superior" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 #, fuzzy msgid "Clone remote repository" msgstr "repositório [criado]" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Seja sucinto e objetivo. Use um arquivo README para descrições mais " "longas." -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório." -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "Tipo de repositório a criar." -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "Revisão de pouso" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3593,63 +3640,76 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, fuzzy, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 #, fuzzy msgid "Extra Fields" msgstr "Campos extras" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "Remoto" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "Estatísticas" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 #, fuzzy msgid "Parent" msgstr "Progenitor do grupo" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 #, fuzzy msgid "Manually set this repository as a fork of another from the list." msgstr "" "Marque manualmente este repositório como uma bifurcação de um outro da " "lista" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 #, fuzzy msgid "Public Journal Visibility" msgstr "diário público" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "Remover do diário público" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 #, fuzzy msgid "Add to Public Journal" msgstr "diário público" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 #, fuzzy msgid "" "All actions done in this repository will be visible to everyone in the " @@ -3658,41 +3718,49 @@ "Todas as ações feitas nesse repositório serão acessíveis a todos no " "diário público" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 #, fuzzy msgid "Change Locking" msgstr "Habilitar travas" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 #, fuzzy msgid "Confirm to unlock repository." msgstr "Confirme para destravar repositório" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 #, fuzzy msgid "Unlock Repository" msgstr "Repositório público" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 #, python-format msgid "Locked by %s on %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 #, fuzzy msgid "Confirm to lock repository." msgstr "Confirme para travar repositório" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 #, fuzzy msgid "Lock Repository" msgstr "Repositório público" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "Repositório não está travado" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3700,33 +3768,40 @@ "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Confirma excluir esse repositório: %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 #, fuzzy msgid "Delete this Repository" msgstr "[excluir] repositório" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 #, fuzzy, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "este repositório tem %s bifurcação" msgstr[1] "este repositório tem %s bifurcações" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "Desassociar bifurcações" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "Excluir bifurcações" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3738,7 +3813,7 @@ msgid "Invalidate Repository Cache" msgstr "Invalidar cache do repositório" -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 #, fuzzy msgid "" "Manually invalidate cache for this repository. On first access, the " @@ -3747,102 +3822,112 @@ "Invalidar manualmente o cache deste repositório. No próximo acesso o " "repositório será cacheado novamente" -#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 #, fuzzy msgid "List of Cached Values" msgstr "Lista de valores cacheados" -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "Prefix" msgstr "Prefixo" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "Chave" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "Ativo" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "Confirme para excluir este campo: %s" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "Próxima chave de campo" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "Próximo rótulo de campo" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "Entre com o rótulo curto" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "Nova descrição de campo" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "Entre com a descrição de um campo" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 #, fuzzy msgid "Extra fields are disabled." msgstr "Registro desabilitado" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "repositório privado" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "[forked] repository" +msgid "Fork of repository" +msgstr "repositório [bifurcado]" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "Repositório %s criado" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 #, fuzzy msgid "Pull Changes from Remote Repository" msgstr "[pulled do remote] no repositório" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 #, fuzzy msgid "Confirm to pull changes from remote repository." msgstr "Confirma realizar pull de alterações a partir de lado remoto" -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 #, fuzzy msgid "Permanent Repository ID" msgstr "repositório privado" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3852,35 +3937,35 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "repositório [criado]" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 #, fuzzy msgid "Repository URL" msgstr "Repositório" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "Revisão padrão para página de arquivos, downloads, whoosh e readme" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "Mudar o dono desse repositório." -#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 msgid "Processed commits" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 msgid "Processed progress" msgstr "" @@ -3895,285 +3980,339 @@ msgstr "Confirma remover atuais estatísticas" #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 #, fuzzy msgid "Repositories Administration" msgstr "Administração de repositórios" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 #, fuzzy msgid "Settings Administration" msgstr "Administração de configurações" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "Ganchos" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "Enviar" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "Marca do site" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "Realm de autenticação HTTP" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems like Google" +" Analytics or Piwik, but also to perform " +"instance-specific customizations like adding a " +"project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 #, fuzzy msgid "Save Settings" msgstr "Salvar configurações" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 #, fuzzy msgid "Custom Hooks" msgstr "Ganchos customizados" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "Falha ao remover gancho" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Rescan option" +msgid "Rescan options" msgstr "Opção de varredura" -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 #, fuzzy msgid "Delete records of missing repositories" msgstr "Buscar nos repositórios" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 msgid "" "Check this option to remove all comments, pull requests and other records" " related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "Invalidar o cache para todos os repositórios" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 #, fuzzy msgid "Check this to reload data and clear cache keys for all repositories." msgstr "Invalidar o cache para todos os repositórios" -#: kallithea/templates/admin/settings/settings_mapping.html:23 +#: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 msgid "Install Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 +#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " "not seem to come from Kallithea. WARNING: This operation will destroy any" " custom git hooks you may have deployed by hand!" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/templates/admin/settings/settings_mapping.html:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "Opção de construção do índice" -#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 msgid "Build from scratch" msgstr "Construir do zero" -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "Reindexar" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Kallithea version" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -#, fuzzy -msgid "Git version" -msgstr "Editar Permissão" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 +msgid "Kallithea configuration file" +msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:10 -msgid "Upgrade info endpoint" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 +#, fuzzy +msgid "Git version" +msgstr "Editar Permissão" + +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 +msgid "Upgrade info endpoint" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "Web" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "Requer SSL para operações de VCS" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "Mostrar tamanho do repositório após o push" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "Armazenar registro de comandos de push dos usuários" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "Armazenar registro de comandos de pull dos usuários" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "Atualizar repositório após realizar push (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 #, fuzzy msgid "Mercurial extensions" msgstr "Extensões do Mercurial" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 msgid "Enable largefiles extension" msgstr "Habilitar extensão largefiles" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 msgid "Enable hgsubversion extension" msgstr "Habilitar extensão hgsubversion" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 #, fuzzy msgid "Location of repositories" msgstr "Criar repositórios" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting" " take effect." @@ -4181,37 +4320,44 @@ "Clique para destravar. Você deve reiniciar o Kallithea para que esta " "configuração tenha efeito." -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "Geral" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "Usar campos extras do repositório" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "Permite armazenar campos customizados adicionais por repositório." -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "Mostrar versão do Kallithea" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4228,103 +4374,128 @@ "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +#, fuzzy +msgid "Clone URL" +msgstr "URL de clonagem" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." "\n" -" The following " +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user" +" username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "Itens do dashboard" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repository Size" +msgid "Repository page size" +msgstr "Tamanho do Repositório" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 msgid "Icons" msgstr "Ícones" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 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 +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 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 +#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 #, 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 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 #, fuzzy msgid "Meta Tagging" msgstr "Meta-Tagging" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "Adicionar grupo de usuários" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 #, fuzzy msgid "Show Members" msgstr "membros" @@ -4335,13 +4506,15 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "Membros" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "Confirme para excluir este grupo de usuário: %s" @@ -4350,49 +4523,60 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "Nenhum membro ainda" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "Membros escolhidos do grupo" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "Membros disponíveis" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 #, fuzzy msgid "User Groups Administration" msgstr "Administração de grupos de usuários" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "Adicionar usuário" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "Usuários" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "Confirmação de senha" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "" @@ -4402,12 +4586,14 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "" @@ -4416,7 +4602,8 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "Confirma excluir este usuário: %s" @@ -4425,459 +4612,522 @@ msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "Confirmação de nova senha" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 #, fuzzy msgid "Users Administration" msgstr "Administração de usuários" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "Instância de servidor: %s" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "Repositório Mercurial" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "Repositório Git" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 #, fuzzy msgid "Create Fork" msgstr "Excluir bifurcações" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "Sumário" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "Registro de alterações" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "Arquivos" -#: kallithea/templates/base/base.html:142 -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 msgid "Options" msgstr "Opções" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:147 +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 #, fuzzy msgid "Compare Fork" msgstr "Compare bifurcação" -#: kallithea/templates/base/base.html:154 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 msgid "Compare" msgstr "Compare" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:331 +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 msgid "Search" msgstr "Pesquisar" -#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:155 +#: kallithea/tests/data/templates/base/base.html.py:399 msgid "Unlock" msgstr "Destravar" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:157 +#: kallithea/tests/data/templates/base/base.html.py:405 msgid "Lock" msgstr "Travar" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:165 +#: kallithea/tests/data/templates/base/base.html.py:413 msgid "Follow" msgstr "Seguir" -#: kallithea/templates/base/base.html:171 +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 msgid "Unfollow" msgstr "Parar de seguir" -#: kallithea/templates/base/base.html:174 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 msgid "Fork" msgstr "Bifurcação" -#: kallithea/templates/base/base.html:175 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/base/base.html:170 +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 msgid "Create Pull Request" msgstr "Criar Pull Request" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "Mostrar Pull Requests para %s" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 msgid "Switch To" msgstr "Trocar Para" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:485 +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:305 +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "Mostrar atividade recente" +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 +msgid "Public journal" +msgstr "Diário público" + +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 +msgid "Show public gists" +msgstr "Mostrar gists públicos" + +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 +msgid "Gists" +msgstr "Gists" + #: kallithea/templates/base/base.html:311 -#: kallithea/templates/base/base.html:312 -msgid "Public journal" -msgstr "Diário público" - -#: kallithea/templates/base/base.html:317 -msgid "Show public gists" -msgstr "Mostrar gists públicos" - -#: kallithea/templates/base/base.html:318 -msgid "Gists" -msgstr "Gists" - -#: kallithea/templates/base/base.html:322 +#: kallithea/tests/data/templates/base/base.html.py:525 #, fuzzy msgid "All Public Gists" msgstr "Todos os gists públicos" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 #, fuzzy msgid "My Public Gists" msgstr "Meus gists públicos" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 #, fuzzy msgid "My Private Gists" msgstr "Meus gists privados" -#: kallithea/templates/base/base.html:330 +#: kallithea/templates/base/base.html:319 +#: kallithea/tests/data/templates/base/base.html.py:540 msgid "Search in repositories" msgstr "Buscar nos repositórios" -#: kallithea/templates/base/base.html:353 -#: kallithea/templates/base/base.html:354 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 #, fuzzy msgid "My Pull Requests" msgstr "Pull requests" -#: kallithea/templates/base/base.html:377 +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 #, fuzzy msgid "Not Logged In" msgstr "Não logado" -#: kallithea/templates/base/base.html:384 +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 #, fuzzy msgid "Login to Your Account" msgstr "Entrar com sua conta" -#: kallithea/templates/base/base.html:407 -msgid "Forgot password ?" +#: kallithea/templates/base/base.html:385 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" msgstr "Esqueceu a senha ?" -#: kallithea/templates/base/base.html:434 +#: kallithea/templates/base/base.html:389 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "Não possui uma conta ?" + +#: kallithea/templates/base/base.html:407 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "Sair" -#: kallithea/templates/base/base.html:615 -msgid "Keyboard shortcuts" -msgstr "" - -#: kallithea/templates/base/base.html:624 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 #, fuzzy msgid "Inherit defaults" msgstr "Padrões de repositórios" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "Criar repositórios" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 msgid "Select this option to allow repository creation for this user" msgstr "" "Selecione esta opção para permitir a criação de repositórios para este " "usuário" -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "Criar grupos de usuários" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "" "Selecione esta opção para permitir a criação de grupos de usuários para " "este usuário" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "Bufurcar repositórios" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "" "Selecione esta opção para permitir a bifurcação de repositórios para este" " usuário" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "Mostrar" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "Nenhuma permissão definida ainda" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "Permissão" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "Editar Permissão" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 +#: kallithea/templates/base/root.html:25 +#: kallithea/tests/data/templates/base/root.html.py:85 #, fuzzy msgid "Add Another Comment" msgstr "Adicionar outro comentário" -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 +#: kallithea/templates/base/root.html:26 +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 msgid "Stop following this repository" msgstr "Parar de seguir este repositório" -#: kallithea/templates/base/root.html:24 +#: kallithea/templates/base/root.html:27 +#: kallithea/tests/data/templates/base/root.html.py:89 msgid "Start following this repository" msgstr "Passar a seguir este repositório" -#: kallithea/templates/base/root.html:25 +#: kallithea/templates/base/root.html:28 +#: kallithea/tests/data/templates/base/root.html.py:91 msgid "Group" msgstr "Grupo" -#: kallithea/templates/base/root.html:26 +#: kallithea/templates/base/root.html:29 +#: kallithea/tests/data/templates/base/root.html.py:93 msgid "members" msgstr "membros" -#: kallithea/templates/base/root.html:27 +#: kallithea/templates/base/root.html:30 +#: kallithea/tests/data/templates/base/root.html.py:95 msgid "Loading ..." msgstr "Carregando..." -#: kallithea/templates/base/root.html:28 +#: kallithea/templates/base/root.html:31 +#: kallithea/tests/data/templates/base/root.html.py:97 msgid "loading ..." msgstr "carregando ..." -#: kallithea/templates/base/root.html:29 +#: kallithea/templates/base/root.html:32 +#: kallithea/tests/data/templates/base/root.html.py:99 msgid "Search truncated" msgstr "Busca truncada" -#: kallithea/templates/base/root.html:30 +#: kallithea/templates/base/root.html:33 +#: kallithea/tests/data/templates/base/root.html.py:101 msgid "No matching files" msgstr "Nenhum arquivo encontrado" -#: kallithea/templates/base/root.html:31 +#: kallithea/templates/base/root.html:34 +#: kallithea/tests/data/templates/base/root.html.py:103 #, fuzzy msgid "Open New Pull Request from {0}" msgstr "Comentar no pull request #%s" -#: kallithea/templates/base/root.html:32 +#: kallithea/templates/base/root.html:35 +#: kallithea/tests/data/templates/base/root.html.py:105 msgid "Open New Pull Request for {0} → {1}" msgstr "" -#: kallithea/templates/base/root.html:33 +#: kallithea/templates/base/root.html:36 +#: kallithea/tests/data/templates/base/root.html.py:107 #, fuzzy msgid "Show Selected Changesets {0} → {1}" msgstr "Mostrar changesets selecionados __S -> __E" -#: kallithea/templates/base/root.html:34 +#: kallithea/templates/base/root.html:37 +#: kallithea/tests/data/templates/base/root.html.py:109 #, fuzzy msgid "Selection Link" msgstr "Link da seleção" -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/base/root.html:38 +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 #, fuzzy msgid "Collapse Diff" msgstr "Colapsar diff" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:39 +#: kallithea/tests/data/templates/base/root.html.py:113 #, fuzzy msgid "Expand Diff" msgstr "Expandir diff" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:40 +#: kallithea/tests/data/templates/base/root.html.py:115 msgid "Failed to revoke permission" msgstr "Falhou ao revocar a permissão" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 #, fuzzy msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "confirme para revogar permissão para {0}: {1} ?" -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/base/root.html:42 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 #, fuzzy msgid "Specify changeset" msgstr "%s Changeset" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "%s Bookmarks" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "Autor" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "Revisão" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "%s Ramos" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "Clique para ordenar em ordem crescente" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "Clique para ordenar em ordem descrescente" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "Nenhum registro encontrado." + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "Erro de dados." + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." +msgstr "Carregando..." #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "%s Changelog" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "mostrando %d de %d revisão" msgstr[1] "mostrando %d de %d revisões" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "Deselecionar seleção" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 #, 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 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "Comparar bifurcação com %s" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, fuzzy, python-format msgid "Compare fork with parent repository (%s)" msgstr "Comparar bifurcação com %s" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 #, fuzzy msgid "Branch filter:" msgstr "filtro" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 #, fuzzy, python-format -#| msgid "" "Changeset status: %s\n" "Click to open associated pull request %s" msgid "" "Changeset status: %s by %s\n" "Click to open associated pull request %s" @@ -4885,237 +5135,325 @@ "Estado do changeset: %s\n" "Clique para abrir os pull request #%s associado" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/changelog/changelog_summary_data.html:24 +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 #, fuzzy, python-format -#| msgid "Changeset status: %s" msgid "Changeset status: %s by %s" msgstr "Estado do changeset: %s" +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 +msgid "Expand commit message" +msgstr "" + #: kallithea/templates/changelog/changelog.html:116 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:125 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "O changeset tem comentários" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:57 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "Bookmark %s" -#: kallithea/templates/changelog/changelog.html:141 -#: kallithea/templates/changelog/changelog_summary_data.html:63 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#: kallithea/templates/compare/compare_cs.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:203 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "Tag %s" -#: kallithea/templates/changelog/changelog.html:146 -#: kallithea/templates/changelog/changelog_summary_data.html:68 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "Ramo %s" -#: kallithea/templates/changelog/changelog.html:311 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "Ainda não há alteações" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "Removido" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "Modificado" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:47 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "Adicionado" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "Afetados %s arquivos" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "Revisão" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "Idade" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "Autor" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "Refs" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "Adicionar ou enviar arquivos diretamente pelo Kallithea" -#: kallithea/templates/changelog/changelog_summary_data.html:87 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:93 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 #, fuzzy msgid "Push new repository" msgstr "Fazer push de novo repositório" -#: kallithea/templates/changelog/changelog_summary_data.html:101 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "Repositório existente?" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "%s Changeset" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:39 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "Estado do changeset" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "Diff cru" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "D" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:75 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "Baixar diff" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 #, fuzzy msgid "Merge" msgstr "mesclar" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 #, fuzzy msgid "Grafted from:" msgstr "Criado em" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 #, fuzzy msgid "Replaced by:" msgstr "criado" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 #, fuzzy msgid "Preceded by:" msgstr "criado" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:329 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "%s arquivo modificado" msgstr[1] "%s arquivos modificados" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:62 -#: kallithea/templates/pullrequests/pullrequest_show.html:331 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "%s arquivo modificado com %s inserções e %s exclusões" msgstr[1] "%s arquivos modificados com %s inserções e %s exclusões" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 #, fuzzy msgid "Show full diff anyway" msgstr "Mostrar diff completo" -#: kallithea/templates/changeset/changeset.html:231 -#: kallithea/templates/changeset/changeset.html:268 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 #, fuzzy msgid "No revisions" msgstr "revisões" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 #, fuzzy msgid "on pull request" msgstr "Comentar no pull request #%s" -#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 #, fuzzy msgid "No title" msgstr "novo arquivo" -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 #, fuzzy msgid "on this changeset" msgstr "Nenhum changeset" -#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 #, fuzzy msgid "Delete comment?" msgstr "%d comentário" -#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 #, fuzzy msgid "Status change" msgstr "Mudanças mais recentes" -#: kallithea/templates/changeset/changeset_file_comment.html:59 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 #, fuzzy msgid "Commenting on line." msgstr "Comentando a linha {1}." -#: kallithea/templates/changeset/changeset_file_comment.html:60 +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 #, fuzzy msgid "" "Comments are in plain text. Use @username inside this text to notify " @@ -5124,66 +5462,80 @@ "Use @nomedeusuário dentro desse texto para enviar notificação a este " "usuário do Kallithea" -#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 #, fuzzy msgid "Set changeset status" msgstr "Altere o estado do changeset" -#: kallithea/templates/changeset/changeset_file_comment.html:69 +#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 msgid "Vote for pull request status" msgstr "Vote para estado do pull request" -#: kallithea/templates/changeset/changeset_file_comment.html:75 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 #, fuzzy msgid "No change" msgstr "Sem modificações" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 #, fuzzy msgid "Finish pull request" msgstr "Comentar no pull request #%s" -#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 #, fuzzy msgid "Close" msgstr "(fechado)" -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 #, fuzzy msgid "Submitting ..." msgstr "Enviando..." -#: kallithea/templates/changeset/changeset_file_comment.html:104 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "Comentário" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "Você precisa estar logado para comentar." -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "Entrar agora" -#: kallithea/templates/changeset/changeset_file_comment.html:116 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "Ocultar" -#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d comentário" msgstr[1] "%d comentários" -#: kallithea/templates/changeset/changeset_file_comment.html:129 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, fuzzy, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "(%d em linha)" msgstr[1] "(%d em linha)" -#: kallithea/templates/changeset/changeset_file_comment.html:130 +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 #, fuzzy, python-format msgid "%d general" msgid_plural "%d general" @@ -5191,231 +5543,364 @@ msgstr[1] "" #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "%s Changesets" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "Estado do changeset: %s" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "Arquivos afetados" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "arquivo removido" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "Última alteração" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 #, fuzzy msgid "Deleted" msgstr "excluir" -#: kallithea/templates/changeset/diff_block.html:57 +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 #, fuzzy msgid "Renamed" msgstr "renomear" -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Revisão desconhecida %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Nenhum nome de arquivo" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "arquivo adicionado" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "Mostrar diff completo para este arquivo" -#: kallithea/templates/changeset/diff_block.html:69 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "Mostrar diff completo lado-a-lado para este arquivo" -#: kallithea/templates/changeset/diff_block.html:83 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "Mostrar comentários inline" #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "Nenhum changeset" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "Antecessor" - -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "Estado do changeset: %s" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +#, fuzzy +#| msgid "Common ancestor" +msgid "Merge Ancestor" +msgstr "Comentário no changeset" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:85 +#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 #, fuzzy msgid "Show merge diff" msgstr "Mostrar diff completo" -#: kallithea/templates/compare/compare_cs.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:321 -#, fuzzy -msgid "Common ancestor" -msgstr "Comentário no changeset" - -#: kallithea/templates/compare/compare_cs.html:99 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:107 +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 #, fuzzy msgid "is" msgstr "Gist" -#: kallithea/templates/compare/compare_cs.html:108 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, fuzzy, python-format msgid "%s changesets" msgstr "%s Changesets" -#: kallithea/templates/compare/compare_cs.html:109 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 #, fuzzy msgid "behind" msgstr "Reindexar" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "%s Comparar" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "" #: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "" #: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "Mostrando %s commit" msgstr[1] "Mostrando %s commits" -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "Mostrar diff completo" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "Repositório público" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "Nenhum conjunto de alterações ainda." -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "Assinar o feed rss de %s" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "Assinar o feed atom de %s" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "%(user)s comentou no changeset em %(when)s" + +#: kallithea/templates/email_templates/changeset_comment.html:4 #, fuzzy, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "O estado do changeset foi alterado para" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Comment on Changeset \"%s\"" +msgstr "%(user)s comentou no changeset em %(when)s" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset flow" +msgid "Changeset on" +msgstr "Fluxo de changesets" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Ramo" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Mudanças mais recentes" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "Repository has been locked" +msgid "The pull request has been closed." +msgstr "Repositório não está travado" + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "Olá %s" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 #, fuzzy msgid "We have received a request to reset the password for your account." msgstr "Recebemos uma requisição para criar uma nova senha para sua conta." -#: kallithea/templates/email_templates/password_reset.html:8 +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 msgid "" "This account is however managed outside this system and the password " "cannot be changed here." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:13 +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 +#: kallithea/templates/email_templates/pull_request.html:4 #, fuzzy, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, fuzzy, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#| msgid "[commented] on pull request for" +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "[comentado] no pull request para" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "on pull request" +msgid "Pull request from" +msgstr "Comentar no pull request #%s" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +#, fuzzy +#| msgid "Date" +msgid "at" +msgstr "Data" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, fuzzy, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -#, fuzzy -msgid "The comment closed the pull request with status" -msgstr "%s comentou no pull request \"%s\"" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -#, fuzzy -msgid "The comment was made with status" -msgstr "O pull request foi fechado com o estado" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "Veja este usuário aqui" +#| msgid "%(user)s commented on pull request %(age)s" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "%(user)s comentou no pull request em %(when)s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s from %s#%s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "Pull requests de %s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "[comentado] no pull request para" + +#: kallithea/templates/email_templates/registration.html:22 +#, fuzzy +#| msgid "Group name" +msgid "Full Name" +msgstr "Nome do grupo" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5433,85 +5918,107 @@ msgstr "%s Diff de Arquivo" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "%s Arquivos" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "%s Adicionar Arquivos" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "Local" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "ou" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 +#: kallithea/tests/data/templates/files/files_add.html.py:241 #, fuzzy msgid "New file type" msgstr "novo arquivo" -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 #, fuzzy msgid "Commit Changes" msgstr "Realizar commit das alterações" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "Revisão anterior" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "Próxima revisão" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "Seguir o ramo atual" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "Carregando lista de arquivos..." -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 msgid "Size" msgstr "Tamanho" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 msgid "Last Revision" msgstr "Última revisão" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 #, fuzzy msgid "Last Modified" msgstr "Última alteração" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 #, fuzzy msgid "Last Committer" msgstr "Último commiter" @@ -5522,7 +6029,7 @@ msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5535,114 +6042,134 @@ msgid "Edit file" msgstr "Editar arquivo" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "Fonte" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "Editando arquivo" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "%s autor" msgstr[1] "%s autores" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" - -#: kallithea/templates/files/files_source.html:41 +#: kallithea/templates/files/files_source.html:34 +#, fuzzy, python-format +#| msgid "Deleted branch: %s" +msgid "Edit on Branch: %s" +msgstr "Excluído ramo: %s" + +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 msgid "Editing binary files not allowed" msgstr "" -#: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 msgid "Editing files allowed only when on branch head revision" msgstr "" "A edição de arquivos só é permitida quando se está na revisão mais " "recente do ramo" -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/files/files_source.html:41 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "Arquivo binário (%s)" -#: kallithea/templates/files/files_source.html:74 +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 #, fuzzy msgid "File is too big to display." msgstr "Arquivo é grande demais para exibir" -#: kallithea/templates/files/files_source.html:76 +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 #, fuzzy msgid "Show full annotation anyway." msgstr "Mostrar diff completo" -#: kallithea/templates/files/files_source.html:78 +#: kallithea/templates/files/files_source.html:73 +#: kallithea/tests/data/templates/files/files_source.html.py:133 #, fuzzy msgid "Show as raw." msgstr "Mostrar original" #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "anotação" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "Nenhum arquivo no caminho especificado" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "%s Seguidores" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "Seguidores" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "Começou a seguir -" @@ -5651,71 +6178,81 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "Nome da bifurcação" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 #, fuzzy msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "Revisão padrão para página de arquivos, downloads, whoosh e readme" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "Privado" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "Copiar permissões" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "Copiar permissões do repositório bifurcado" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "Atualizar após clonar" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "Checkout fontes depois de criar o clone" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "%s Bifurcações" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "Bifurcações" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "Bifurcado" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "Ainda não há bifurcações" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 msgid "ATOM journal feed" msgstr "ATOM feed do diário" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "RSS feed do diário" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "Ainda não há entradas" @@ -5729,35 +6266,46 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 #, fuzzy msgid "New Pull Request" msgstr "Novo pull request" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "Título" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "Escreva uma breve descrição para este pull request" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "Fluxo de changesets" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "Repositório origem" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "Repositório de destino" @@ -5794,7 +6342,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "Fechado" @@ -5813,129 +6363,163 @@ msgstr "Confirme para excluir este pull request" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, fuzzy, python-format msgid "%s Pull Request %s" msgstr "%s Pull Request #%s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, fuzzy, python-format msgid "Pull request %s from %s#%s" msgstr "Pull requests de %s" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 #, fuzzy msgid "Summarize the changes" msgstr "Realizar commit das alterações" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "Estado do pull request calculado a partir dos votos" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "Estado do pull request calculado a partir dos votos" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "Ainda não revisado por" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "%d revisor" msgstr[1] "%d revisores" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "O pull request foi revisado por todos os revisores" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 #, fuzzy msgid "There are no reviewers" msgstr "Ainda não há ramos" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 #, fuzzy msgid "on" msgstr "nenhum" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "Puxar mudanças" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -#, fuzzy -msgid "Update" -msgstr "usuário [atualizado]" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 +#, fuzzy +#| msgid "Registration" +msgid "Next iteration" +msgstr "Registro" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:215 +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 msgid "" -"Pull requests do not change once created. Select a revision and save to " -"replace this pull request with a new one." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:224 +"Pull request iterations do not change content once created. Select a " +"revision and save to make a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +#, fuzzy +msgid "Cancel Changes" +msgstr "Mudanças mais recentes" + +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 #, fuzzy msgid "Pull Request Reviewers" msgstr "Revisores do pull request" -#: kallithea/templates/pullrequests/pullrequest_show.html:249 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 #, fuzzy msgid "Remove reviewer" msgstr "revisor" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:269 +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 #, fuzzy msgid "Potential Reviewers" msgstr "Visualizar comentário" -#: kallithea/templates/pullrequests/pullrequest_show.html:272 +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:295 -msgid "Save Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:296 -#, fuzzy -msgid "Save Updates as New Pull Request" -msgstr "Crie novo pull request" - -#: kallithea/templates/pullrequests/pullrequest_show.html:297 -#, fuzzy -msgid "Cancel Changes" -msgstr "Mudanças mais recentes" - -#: kallithea/templates/pullrequests/pullrequest_show.html:307 +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 #, fuzzy msgid "Pull Request Content" msgstr "O pull request mudou de estado" +#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +#, fuzzy +msgid "Common ancestor" +msgstr "Comentário no changeset" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5951,250 +6535,476 @@ msgid "Pull Requests to '%s'" msgstr "Pull requests para %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 #, fuzzy msgid "Open New Pull Request" msgstr "Crie novo pull request" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, fuzzy, python-format msgid "Show Pull Requests to %s" msgstr "Pull requests para %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, fuzzy, python-format msgid "Show Pull Requests from '%s'" msgstr "Pull requests de %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 #, fuzzy msgid "Show closed pull requests (in addition to open pull requests)" msgstr "Mostrar pull requests fechados também" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 #, fuzzy msgid "Pull Requests Created by Me" msgstr "Revisores do pull request" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +#, fuzzy +#| msgid "Pull Request Reviewers" +msgid "Pull Requests Needing My Review" +msgstr "Revisores do pull request" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 #, fuzzy msgid "Pull Requests I Participate In" msgstr "Eu participo em" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 #, fuzzy msgid "Search in All Repositories" msgstr "Buscar em todos os repositórios" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "Termo de pesquisa" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "Pesquisando em" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "Conteúdo dos arquivos" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "Mensagens de commit" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "Nomes dos arquivos" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "Permissão negada" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "%s ATOM feed" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "%s RSS feed" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "Habilitar" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "Estatísticas coletadas:" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "arquivos" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "Mostrar mais" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 msgid "commits" msgstr "commits" +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "arquivos adicionados" + +#: kallithea/templates/summary/statistics.html:390 +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" +msgstr "arquivos alterados" + #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "arquivos adicionados" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" -msgstr "arquivos alterados" +#: kallithea/tests/data/templates/summary/statistics.html.py:153 +msgid "files removed" +msgstr "arquivos removidos" #: kallithea/templates/summary/statistics.html:393 -msgid "files removed" -msgstr "arquivos removidos" +#: kallithea/tests/data/templates/summary/statistics.html.py:155 +msgid "commit" +msgstr "commit" + +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 +msgid "file added" +msgstr "arquivo adicionado" #: kallithea/templates/summary/statistics.html:395 -msgid "commit" -msgstr "commit" +#: kallithea/tests/data/templates/summary/statistics.html.py:159 +msgid "file changed" +msgstr "arquivo alterado" #: kallithea/templates/summary/statistics.html:396 -msgid "file added" -msgstr "arquivo adicionado" - -#: kallithea/templates/summary/statistics.html:397 -msgid "file changed" -msgstr "arquivo alterado" - -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "arquivo removido" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "%s Sumário" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "Repositório travado por %s" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "Repositório destravado" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "Bifurcação de" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "Clonar de" -#: kallithea/templates/summary/summary.html:72 -#, fuzzy -msgid "Clone URL" -msgstr "URL de clonagem" - -#: kallithea/templates/summary/summary.html:78 -msgid "Show by Name" -msgstr "Mostrar por Nome" - -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 msgid "Show by ID" msgstr "Mostrar por ID" -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:72 +#: kallithea/tests/data/templates/summary/summary.html.py:143 +msgid "Show by Name" +msgstr "Mostrar por Nome" + +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "Tendências em arquivos" +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 +msgid "Download" +msgstr "Download" + +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 +msgid "There are no downloads yet" +msgstr "Ainda não há downloads" + +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 +msgid "Downloads are disabled for this repository" +msgstr "Downloads estão desabilitados para este repositório" + #: kallithea/templates/summary/summary.html:108 -msgid "Download" -msgstr "Download" +#: kallithea/tests/data/templates/summary/summary.html.py:190 +msgid "Download as zip" +msgstr "Download como zip" #: kallithea/templates/summary/summary.html:112 -msgid "There are no downloads yet" -msgstr "Ainda não há downloads" +#: kallithea/tests/data/templates/summary/summary.html.py:194 +msgid "Check this to download archive with subrepos" +msgstr "Marque isto para descarregar arquivo com subrepositórios" #: kallithea/templates/summary/summary.html:114 -msgid "Downloads are disabled for this repository" -msgstr "Downloads estão desabilitados para este repositório" - -#: kallithea/templates/summary/summary.html:120 -msgid "Download as zip" -msgstr "Download como zip" - -#: kallithea/templates/summary/summary.html:125 -msgid "Check this to download archive with subrepos" -msgstr "Marque isto para descarregar arquivo com subrepositórios" - -#: kallithea/templates/summary/summary.html:125 +#: kallithea/tests/data/templates/summary/summary.html.py:196 #, fuzzy msgid "With subrepos" msgstr "com subrepositórios" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "Tamanho do Repositório" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "Feed" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 #, fuzzy msgid "Latest Changes" msgstr "Mudanças mais recentes" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 #, fuzzy msgid "Quick Start" msgstr "Início rápido" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "Descarregar %s como %s" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "%s Tags" - -#: kallithea/templates/tags/tags.html:26 -#, fuzzy -msgid "Compare Tags" -msgstr "Comparar tags" +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "Painel de Controle" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "Lembre-se de mim" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "Altere o seu avatar em" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "Usando" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "Opção de varredura" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "Web" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "Requer SSL para operações de VCS" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "" +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." +"\n" +" The following " +"variables are available:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "Itens do dashboard" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "" +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "filtro rápido..." + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "Esqueceu a senha ?" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "Antecessor" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, fuzzy, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "O estado do changeset foi alterado para" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, fuzzy, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, fuzzy, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, fuzzy, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +#, fuzzy +msgid "The comment closed the pull request with status" +msgstr "%s comentou no pull request \"%s\"" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +#, fuzzy +msgid "The comment was made with status" +msgstr "O pull request foi fechado com o estado" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "Veja este usuário aqui" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" +msgstr "Tamanho do Repositório" #~ msgid "increase diff context to %(num)s lines" #~ msgstr "" @@ -6235,9 +7045,6 @@ #~ msgid "No Files" #~ msgstr "Nenhum Arquivo" -#~ msgid "" -#~ msgstr "" - #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "O username \\\"%(username)s\\\" é proibido" @@ -6493,3 +7300,223 @@ #~ msgid "New file mode" #~ msgstr "" +#~ msgid "Missing changesets since the previous pull request:" +#~ msgstr "" + +#~ msgid "New changesets on %s %s since the previous pull request:" +#~ msgstr "" + +#~ msgid "Ancestor didn't change - show diff since previous version:" +#~ msgstr "" + +#~ msgid "" +#~ "This pull request is based on " +#~ "another %s revision and there is " +#~ "no simple diff." +#~ msgstr "" + +#~ msgid "No changes found on %s %s since previous version." +#~ msgstr "" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "" + +#~ msgid "The following changes are available on %s:" +#~ msgstr "" + +#~ msgid "No changesets found for updating this pull request." +#~ msgstr "" + +#~ msgid "Git pull requests don't support updates yet." +#~ msgstr "" + +#~ msgid "Closing." +#~ msgstr "carregando ..." + +#~ msgid "Repository no access" +#~ msgstr "Nenhum acesso ao repositório" + +#~ msgid "Repository read access" +#~ msgstr "Acesso de leitura ao repositório" + +#~ msgid "Repository write access" +#~ msgstr "Acesso de escrita ao repositório" + +#~ msgid "Repository admin access" +#~ msgstr "Acesso administrativo ao repositório" + +#~ msgid "Repository Group no access" +#~ msgstr "Nenhum acesso ao Grupo de Repositórios" + +#~ msgid "Repository Group read access" +#~ msgstr "Acesso de leitura ao Grupo de Repositórios" + +#~ msgid "Repository Group write access" +#~ msgstr "Acesso de escrita ao Grupo de Repositórios" + +#~ msgid "Repository Group admin access" +#~ msgstr "Acesso administrativo ao Grupo de Repositórios" + +#~ msgid "Repository creation disabled" +#~ msgstr "Criação de repositórios desabilitada" + +#~ msgid "Repository creation enabled" +#~ msgstr "Criação de repositórios habilitada" + +#~ msgid "Repository forking disabled" +#~ msgstr "Bifurcação de repositórios desabilitada" + +#~ msgid "Repository forking enabled" +#~ msgstr "Bifurcação de repositórios habilitada" + +#~ msgid "Register disabled" +#~ msgstr "Registro desabilitado" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "Registro de novo usuário no Kallithea com ativação manual" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "Registro de novo usuário no Kallithea com auto-ativação" + +#~ msgid "Not Reviewed" +#~ msgstr "Não Revisado" + +#~ msgid "Rejected" +#~ msgstr "Rejeitado" + +#~ msgid "Under Review" +#~ msgstr "Sob Revisão" + +#~ msgid "Repository group no access" +#~ msgstr "Sem acesso ao grupo de repositórios" + +#~ msgid "Repository group read access" +#~ msgstr "Acesso de leitura ao grupo de repositórios" + +#~ msgid "Repository group write access" +#~ msgstr "Acesso de escrita ao grupo de repositórios" + +#~ msgid "Repository group admin access" +#~ msgstr "Acesso administrativo ao grupo de repositórios" + +#~ msgid "User group no access" +#~ msgstr "Sem acesso ao grupo de usuários" + +#~ msgid "User group read access" +#~ msgstr "Acesso de leitura ao grupo de usuários" + +#~ msgid "User group write access" +#~ msgstr "Acesso de escrita ao grupo de usuários" + +#~ msgid "User group admin access" +#~ msgstr "Acesso administrativo ao grupo de usuários" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "Criação de Grupo de Repositórios desatilibada" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "Criação de Grupo de Repositórios habilitada" + +#~ msgid "User Group creation disabled" +#~ msgstr "Criação de Grupo de Usuários desabilitada" + +#~ msgid "User Group creation enabled" +#~ msgstr "Criação de Grupo de Usuários habilitada" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "Registro de Usuário com ativação manual de conta" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "Registro de Usuário com ativação automática de conta" + +#~ msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "%(user)s solicita sua revisão no pull request $%(pr_id)s: %(pr_title)s" + +#~ msgid "repositories" +#~ msgstr "repositórios" + +#~ msgid "No repositories found." +#~ msgstr "Nenhum repositório encontrado." + +#~ msgid "There are no branches yet" +#~ msgstr "Ainda não há ramos" + +#~ msgid "There are no tags yet" +#~ msgstr "Ainda não há etiquetas" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "Ainda não há marcadores" + +#~ msgid "Analytics HTML block" +#~ msgstr "" + +#~ msgid "" +#~ "HTML with JavaScript for web analytics" +#~ " systems like Google Analytics or " +#~ "Piwik. This will be added at the" +#~ " bottom of every page." +#~ msgstr "" + +#~ msgid "" +#~ "Schema of clone URL construction eg. " +#~ "'{scheme}://{user}@{netloc}/{repo}'.\n" +#~ " The " +#~ "following variables are available:\n" +#~ " {scheme}" +#~ " 'http' or 'https' sent from running" +#~ " Kallithea server,\n" +#~ " {user}" +#~ " current user username,\n" +#~ " {netloc}" +#~ " network location/server host of running" +#~ " Kallithea server,\n" +#~ " {repo}" +#~ " full repository name,\n" +#~ " {repoid}" +#~ " ID of repository, can be used " +#~ "to contruct clone-by-id" +#~ msgstr "" + +#~ msgid "enabled" +#~ msgstr "" + +#~ msgid "disabled" +#~ msgstr "" + +#~ msgid "%s Bookmarks" +#~ msgstr "%s Bookmarks" + +#~ msgid "Compare Bookmarks" +#~ msgstr "" + +#~ msgid "%s Branches" +#~ msgstr "%s Ramos" + +#~ msgid "Compare Branches" +#~ msgstr "" + +#~ msgid "Editing file" +#~ msgstr "Editando arquivo" + +#~ msgid "Update" +#~ msgstr "usuário [atualizado]" + +#~ msgid "" +#~ "Pull requests do not change once " +#~ "created. Select a revision and save " +#~ "to replace this pull request with " +#~ "a new one." +#~ msgstr "" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "Crie novo pull request" + +#~ msgid "%s Tags" +#~ msgstr "%s Tags" + +#~ msgid "Compare Tags" +#~ msgstr "Comparar tags" + diff -r a48802bf7134 -r 880e2f07651b kallithea/i18n/ru/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Thu Jul 27 03:02:37 2017 +0200 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Thu Jul 27 14:26:14 2017 +0200 @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2016-03-14 16:51+0100\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: 2017-01-05 14:58+0000\n" "Last-Translator: Andrew Shadura \n" "Language-Team: Russian " @@ -31,449 +31,493 @@ "4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 2.11-dev\n" -#: kallithea/controllers/changelog.py:85 -#: kallithea/controllers/pullrequests.py:240 kallithea/lib/base.py:515 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "Ещё не было изменений" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "Ничего" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:198 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "(закрыто)" -#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "Отображать пробелы" -#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 msgid "Ignore whitespace" msgstr "Игнорировать пробелы" -#: kallithea/controllers/changeset.py:168 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Увеличить контекст до %(num)s строк" -#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:744 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "Нет такой ревизии в этом репозитории" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "Выбрать набор изменений" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "Перейти на верхушку репозитория" + +#: kallithea/controllers/compare.py:73 +#, fuzzy +#| msgid "Cannot compare repositories without using common ancestor" +msgid "Cannot compare repositories of different types" +msgstr "Невозможно сравнивать репозитории без общего предка" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "Невозможно сравнивать репозитории без общего предка" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 msgid "No response" msgstr "Нет ответа" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "Неизвестная ошибка" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "Запрос не распознан сервером из-за неправильного синтаксиса." -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Несанкционированный доступ к ресурсу" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "У вас нет прав для просмотра этой страницы" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "Ресурс не найден" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "Сервер не может выполнить запрос из-за неправильного условия в запросе." -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "Изменения в репозитории %s" - -#: kallithea/controllers/feed.py:56 +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 +#: kallithea/templates/changeset/changeset.html:195 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 +msgid "Changeset was too big and was cut off..." +msgstr "Изменения оказались слишком большими и были вырезаны..." + +#: kallithea/controllers/feed.py:84 +#, python-format +msgid "%s committed on %s" +msgstr "%s выполнил коммит в %s" + +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 #, python-format msgid "%s %s feed" msgstr "Лента новостей %s %s" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 -msgid "Changeset was too big and was cut off..." -msgstr "Изменения оказались слишком большими и были вырезаны..." - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "%s выполнил коммит в %s" - -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 +#, python-format +msgid "Changes on %s repository" +msgstr "Изменения в репозитории %s" + +#: kallithea/controllers/files.py:93 msgid "Click here to add new file" msgstr "Нажмите чтобы добавить новый файл" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "Нет файлов. %s" -#: kallithea/controllers/files.py:195 +#: kallithea/controllers/files.py:191 #, python-format msgid "%s at %s" msgstr "%s (%s)" -#: kallithea/controllers/files.py:307 kallithea/controllers/files.py:367 -#: kallithea/controllers/files.py:434 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Репозиторий заблокировал %s в %s" -#: kallithea/controllers/files.py:319 +#: kallithea/controllers/files.py:309 msgid "You can only delete files with revision being a valid branch" msgstr "Вы можете удалять файлы только в ревизии, связанной с существующей веткой " -#: kallithea/controllers/files.py:330 +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Файл %s удалён с помощью Kallithea" -#: kallithea/controllers/files.py:352 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "Файл %s удалён" -#: kallithea/controllers/files.py:356 kallithea/controllers/files.py:422 -#: kallithea/controllers/files.py:503 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "Во время коммита произошла ошибка" -#: kallithea/controllers/files.py:379 +#: kallithea/controllers/files.py:369 msgid "You can only edit files with revision being a valid branch" msgstr "" "Вы можете редактировать файлы только в ревизии, связанной с существующей " "веткой " -#: kallithea/controllers/files.py:393 +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "Файл %s отредактирован с помощью Kallithea" -#: kallithea/controllers/files.py:409 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "Без изменений" -#: kallithea/controllers/files.py:418 kallithea/controllers/files.py:492 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "Изменения применены в %s" -#: kallithea/controllers/files.py:445 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "Файл добавлен с помощью Kallithea" -#: kallithea/controllers/files.py:466 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "Пусто" -#: kallithea/controllers/files.py:470 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "Безымянный" -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Расположение должно быть относительным путем, и не должно содержать " "\"..\" в пути" -#: kallithea/controllers/files.py:528 +#: kallithea/controllers/files.py:517 msgid "Downloads disabled" msgstr "Возможность скачивать отключена" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:528 #, python-format msgid "Unknown revision %s" msgstr "Неизвестная ревизия %s" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "Пустой репозиторий" -#: kallithea/controllers/files.py:543 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "Неизвестный тип архива" -#: kallithea/controllers/files.py:773 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "Набор изменений" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "Ветки" -#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "Метки" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "Произошла ошибка во время создания форка репозитория %s" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "Группы" -#: kallithea/controllers/home.py:94 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:479 -#: kallithea/templates/base/base.html:653 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "Репозитории" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "Ветка" -#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "Закрытые ветки" -#: kallithea/controllers/home.py:151 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "Тэги" -#: kallithea/controllers/home.py:157 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "Закладки" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "Публичный журнал" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:306 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "Журнал" -#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 msgid "Bad captcha" msgstr "Неверная капча" -#: kallithea/controllers/login.py:150 +#: kallithea/controllers/login.py:148 +#, python-format msgid "You have successfully registered with %s" msgstr "Регистрация в %s прошла успешно" -#: kallithea/controllers/login.py:195 +#: kallithea/controllers/login.py:193 msgid "A password reset confirmation code has been sent" msgstr "Код для сброса пароля отправлена" -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:242 msgid "Invalid password reset token" msgstr "Неверный код сброса пароля" -#: kallithea/controllers/login.py:249 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "Пароль обновлён" -#: kallithea/controllers/pullrequests.py:123 +#: kallithea/controllers/pullrequests.py:73 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:135 #, python-format msgid "%s (closed)" msgstr "%s (закрыта)" -#: kallithea/controllers/pullrequests.py:151 +#: kallithea/controllers/pullrequests.py:162 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 msgid "Changeset" msgstr "Изменения" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:183 msgid "Special" msgstr "Специальный" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:184 msgid "Peer branches" msgstr "Ветки участника" -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 msgid "Bookmarks" msgstr "Закладки" -#: kallithea/controllers/pullrequests.py:312 +#: kallithea/controllers/pullrequests.py:326 #, python-format msgid "Error creating pull request: %s" msgstr "Ошибка при создании pull-запроса: %s" +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 +msgid "Error occurred while creating pull request" +msgstr "Произошла ошибка при создании pull-запроса" + #: kallithea/controllers/pullrequests.py:358 -#: kallithea/controllers/pullrequests.py:505 -msgid "No description" -msgstr "Нет описания" - -#: kallithea/controllers/pullrequests.py:365 msgid "Successfully opened new pull request" msgstr "Pull-запрос создан успешно" -#: kallithea/controllers/pullrequests.py:368 -#: kallithea/controllers/pullrequests.py:455 -#: kallithea/controllers/pullrequests.py:512 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:371 -#: kallithea/controllers/pullrequests.py:458 -msgid "Error occurred while creating pull request" -msgstr "Произошла ошибка при создании pull-запроса" - -#: kallithea/controllers/pullrequests.py:403 -msgid "Missing changesets since the previous pull request:" -msgstr "Отсутствующие ревизии относительно предыдущего pull-запроса:" +#: kallithea/controllers/pullrequests.py:381 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" +msgstr "Обновление для pull-запроса создано" #: kallithea/controllers/pullrequests.py:410 #, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "Новые ревизии на %s %s относительно предыдущего pull-запроса:" - -#: kallithea/controllers/pullrequests.py:417 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "Этот pull-запрос основан на другой ревизии %s, простой diff невозможен." - -#: kallithea/controllers/pullrequests.py:426 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "Нет изменений на %s %s относительно предыдущей версии." - -#: kallithea/controllers/pullrequests.py:464 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "Закрыт, замещён %s ." - -#: kallithea/controllers/pullrequests.py:472 -msgid "Pull request update created" -msgstr "Обновление для pull-запроса создано" - -#: kallithea/controllers/pullrequests.py:516 +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:414 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "Нет описания" + +#: kallithea/controllers/pullrequests.py:439 msgid "Pull request updated" msgstr "Pull-запрос обновлён" -#: kallithea/controllers/pullrequests.py:531 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "Pull-запрос успешно удалён" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:491 +#, fuzzy, python-format +#| msgid "Changeset for %s %s not found in %s" +msgid "Revision %s not found in %s" +msgstr "Набор изменений не найден" + +#: kallithea/controllers/pullrequests.py:518 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "Нет изменений для обновления этого pull-запроса." + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "Этот pull-запрос уже принят на ветку %s." -#: kallithea/controllers/pullrequests.py:599 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "Этот pull-запрос был закрыт и не может быть обновлён." -#: kallithea/controllers/pullrequests.py:617 -#, python-format -msgid "The following changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:621 -msgid "No changesets found for updating this pull request." +#: kallithea/controllers/pullrequests.py:552 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:556 +#, fuzzy +#| msgid "No changesets found for updating this pull request." +msgid "No additional changesets found for iterating on this pull request." msgstr "Нет изменений для обновления этого pull-запроса." -#: kallithea/controllers/pullrequests.py:629 +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Внимание: Ветка %s имеет ещё одну верхушку: %s." -#: kallithea/controllers/pullrequests.py:635 -msgid "Git pull requests don't support updates yet." +#: kallithea/controllers/pullrequests.py:571 +#, fuzzy +#| msgid "Git pull requests don't support updates yet." +msgid "Git pull requests don't support iterating yet." msgstr "Обновление pull-запросы git не поддерживается." -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:573 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "Нет изменений для обновления этого pull-запроса." + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:738 +#: kallithea/controllers/pullrequests.py:676 #, fuzzy, python-format msgid "Successfully deleted pull request %s" msgstr "Pull-запрос успешно удалён" -#: kallithea/controllers/pullrequests.py:748 -msgid "Closing." -msgstr "Закрыт." - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "Недопустимый поисковый запрос. Попробуйте заключить его в кавычки." -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "Индексы отсутствуют. Пожалуйста, запустите индексатор Whoosh" -#: kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Произошла ошибка при выполнении этого поиска." -#: kallithea/controllers/summary.py:181 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 msgid "No data ready yet" msgstr "Нет данных" -#: kallithea/controllers/summary.py:184 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "Статистические данные отключены для этого репозитария" @@ -485,152 +529,156 @@ msgid "error occurred during update of auth settings" msgstr "произошла ошибка при обновлении настроек авторизации" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "Стандартные настройки успешно обновлены" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "Произошла ошибка при обновлении стандартных настроек" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 #, fuzzy msgid "Forever" msgstr "навсегда" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "5 minutes" msgstr "5 минут" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 hour" msgstr "1 час" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 msgid "1 day" msgstr "1 день" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "1 месяц" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:290 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "Срок" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "Произошла ошибка во время создания gist-записи" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "Gist-запись %s удалена" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:200 msgid "Unmodified" msgstr "Неизменный" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "Данные gist-записи обновлены" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "Произошла ошибка при обновлении gist-записи %s" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Вы не можете изменить данные этого пользователя, поскольку он важен для " "работы всего приложения" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "Ваша учетная запись успешно обновлена" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:201 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "Произошла ошибка при обновлении пользователя %s" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "Ошибка при обновлении пароля" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "Пользователю добавлен e-mail %s" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "Произошла ошибка при сохранении e-mail" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "E-mail пользователя удалён" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "API-ключ успешно создан" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "API-ключ успешно сброшен" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:324 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "API-ключ успешно удалён" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "Чтение" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" -msgstr "Запись" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" +msgstr "Чтение" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "Запись" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -638,277 +686,294 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:336 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:344 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "Администратор" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "Отключено" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "Разрешена, с ручной активацией учётной записи" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "Разрешена, с автоматической активацией учётной записи" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1705 -msgid "Manual activation of external account" -msgstr "Ручная активация внешней учетной записи" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1706 -msgid "Automatic activation of external account" -msgstr "Автоматическая активация внешней учетной записи" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "Отключено" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "Разрешена, с ручной активацией учётной записи" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "Разрешена, с автоматической активацией учётной записи" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "Ручная активация внешней учетной записи" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "Автоматическая активация внешней учетной записи" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "Включено" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "Глобальные привилегии успешно обновлены" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Произошла ошибка во время обновления привилегий" -#: kallithea/controllers/admin/repo_groups.py:187 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Произошла ошибка при создании группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:192 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "Создана новая группа репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:249 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "Группа репозиториев %s обновлена" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:248 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Произошла ошибка при обновлении группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:283 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Данная группа содержит %s репозитариев и не может быть удалена" -#: kallithea/controllers/admin/repo_groups.py:290 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Группа содержит в себе %s подгрупп и не может быть удалён" -#: kallithea/controllers/admin/repo_groups.py:296 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "Группа репозиториев %s удалена" -#: kallithea/controllers/admin/repo_groups.py:301 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Произошла ошибка при удалении группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:404 -#: kallithea/controllers/admin/repo_groups.py:439 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "Администратор не может отозвать свои привелегии" -#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "Привилегии группы репозиториев обновлены" -#: kallithea/controllers/admin/repo_groups.py:456 -#: kallithea/controllers/admin/repos.py:397 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "Произошла ошибка при отзыве привелегии" -#: kallithea/controllers/admin/repos.py:151 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "Произошла ошибка при создании репозитория %s" -#: kallithea/controllers/admin/repos.py:212 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "Репозиторий %s создан из %s" -#: kallithea/controllers/admin/repos.py:221 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "Сделан форк(копия) репозитория %s на %s" -#: kallithea/controllers/admin/repos.py:224 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "Репозиторий %s создан" -#: kallithea/controllers/admin/repos.py:261 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "Репозитарий %s успешно обновлён" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "Произошла ошибка во время обновления репозитория %s" -#: kallithea/controllers/admin/repos.py:309 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "Форки %s отсоединены" -#: kallithea/controllers/admin/repos.py:312 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "Удалены форки репозитория %s" -#: kallithea/controllers/admin/repos.py:317 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "Репозиторий %s удалён" -#: kallithea/controllers/admin/repos.py:320 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Невозможно удалить %s, у него всё ещё есть форки" -#: kallithea/controllers/admin/repos.py:325 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "Произошла ошибка во время удаления %s" -#: kallithea/controllers/admin/repos.py:373 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "Привилегии репозитория обновлены" -#: kallithea/controllers/admin/repos.py:429 -msgid "An error occurred during creation of field" +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, fuzzy, python-format +#| msgid "An error occurred during creation of field" +msgid "An error occurred during creation of field: %r" msgstr "Произошла ошибка при создании поля" -#: kallithea/controllers/admin/repos.py:443 +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "Произошла ошибка при удалении поля" -#: kallithea/controllers/admin/repos.py:459 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "-- Не форк --" -#: kallithea/controllers/admin/repos.py:490 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "Видимость репозитория в публичном журнале обновлена" -#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "Произошла ошибка при установке репозитария в общедоступный журнал" -#: kallithea/controllers/admin/repos.py:511 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "Ничего" -#: kallithea/controllers/admin/repos.py:513 +#: kallithea/controllers/admin/repos.py:473 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Репозиторий %s отмечен как форк %s" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:480 msgid "An error occurred during this operation" msgstr "Произошла ошибка при выполнении операции" -#: kallithea/controllers/admin/repos.py:536 -#: kallithea/controllers/admin/repos.py:563 +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 msgid "Repository has been locked" msgstr "Репозиторий заблокирован" -#: kallithea/controllers/admin/repos.py:539 -#: kallithea/controllers/admin/repos.py:560 +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 msgid "Repository has been unlocked" msgstr "Репозиторий разблокирован" -#: kallithea/controllers/admin/repos.py:542 -#: kallithea/controllers/admin/repos.py:567 +#: kallithea/controllers/admin/repos.py:502 +#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during unlocking" msgstr "Произошла ошибка во время разблокирования" -#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:533 msgid "Cache invalidation successful" msgstr "Кэш сброшен" -#: kallithea/controllers/admin/repos.py:585 +#: kallithea/controllers/admin/repos.py:537 msgid "An error occurred during cache invalidation" msgstr "Произошла ошибка при очистке кэша" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "Внесены изменения из удалённого репозитория" -#: kallithea/controllers/admin/repos.py:603 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "Произошла ошибка при внесении изменений из удалённого репозитория" -#: kallithea/controllers/admin/repos.py:636 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "Произошла ошибка при удалении статистики репозитория" -#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "Обновлены настройки VCS" -#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -916,337 +981,351 @@ "Невозможно включить поддержку hgsubversion. Библиотека «hgsubversion» " "отсутствует" -#: kallithea/controllers/admin/settings.py:151 -#: kallithea/controllers/admin/settings.py:248 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "Произошла ошибка при обновлении настроек приложения" -#: kallithea/controllers/admin/settings.py:187 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Репозитории успешно пересканированы, добавлено: %s, удалено: %s." -#: kallithea/controllers/admin/settings.py:244 +#: kallithea/controllers/admin/settings.py:189 +#, fuzzy, python-format +msgid "Invalidated %s repositories" +msgstr "Сбросить кэш для всех репозиториев" + +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "Обновленные параметры настройки приложения" -#: kallithea/controllers/admin/settings.py:301 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Настройки визуализации обновлены" -#: kallithea/controllers/admin/settings.py:306 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "Произошла ошибка при обновлении настроек визуализации" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Пожалуйста, введите адрес электронной почты" -#: kallithea/controllers/admin/settings.py:347 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "Задача отправки Email создана" -#: kallithea/controllers/admin/settings.py:378 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "Добавлена новая ловушка" -#: kallithea/controllers/admin/settings.py:392 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "Обновлённые ловушки" -#: kallithea/controllers/admin/settings.py:396 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "произошла ошибка при создании хука" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "Запланирована переиндексация базы Whoosh" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "Создана группа пользователей %s" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Произошла ошибка при создании группы пользователей %s" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "Группа пользователей %s обновлена" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:208 #, python-format msgid "Error occurred during update of user group %s" msgstr "Произошла ошибка при обновлении группы пользователей %s" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:219 msgid "Successfully deleted user group" msgstr "Группа пользователей успешно удалена" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:224 msgid "An error occurred during deletion of user group" msgstr "Произошла ошибка при удалении группы пользователей" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "Целевая группа не может быть такой же" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "Привилегии группы пользователей обновлены" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "Обновлены привилегии" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "Произошла ошибка при сохранении привилегий" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "Пользователь %s создан" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "Произошла ошибка при создании пользователя %s" -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "Пользователь успешно обновлён" -#: kallithea/controllers/admin/users.py:217 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "Пользователь успешно удалён" -#: kallithea/controllers/admin/users.py:222 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "Произошла ошибка при удалении пользователя" -#: kallithea/controllers/admin/users.py:235 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:462 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "Добавлен IP %s в белый список пользователя" -#: kallithea/controllers/admin/users.py:468 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "Произошла ошибка при сохранении IP" -#: kallithea/controllers/admin/users.py:482 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "Удален IP %s из белого списка пользователя" -#: kallithea/lib/auth.py:737 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "IP %s заблокирован" -#: kallithea/lib/auth.py:750 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/auth.py:768 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:813 +#: kallithea/lib/auth.py:829 msgid "You need to be a registered user to perform this action" msgstr "" "Вы должны быть зарегистрированным пользователем, чтобы выполнить это " "действие" -#: kallithea/lib/auth.py:843 +#: kallithea/lib/auth.py:857 msgid "You need to be signed in to view this page" msgstr "Страница доступна только авторизованным пользователям" -#: kallithea/lib/base.py:493 +#: kallithea/lib/base.py:449 +msgid "Invalid API key" +msgstr "" + +#: kallithea/lib/base.py:508 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "Репозиторий не найден на файловой системе" -#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:623 -msgid "Changeset not found" +#: kallithea/lib/base.py:617 +#, fuzzy, python-format +msgid "Changeset for %s %s not found in %s" msgstr "Набор изменений не найден" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "Двоичный файл" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Набор изменения оказался слишком большими и был урезан, используйте меню " "сравнения для показа результата сравнения" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "Изменений не обнаружено" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "Удалена ветка: %s" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "Создан тег: %s" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:613 +#, fuzzy, python-format +msgid "Changeset %s not found" +msgstr "Набор изменений не найден" + +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Показать отличия вместе %s->%s" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 #, fuzzy msgid "Compare view" msgstr "сравнение" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "и" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "на %s больше" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "версии" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, fuzzy, python-format msgid "Fork name %s" msgstr "имя форка %s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, python-format msgid "Pull request %s" msgstr "Pull-запрос %s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "[удален] репозиторий" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 msgid "[created] repository" msgstr "[создан] репозиторий" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "[создан] репозиторий как форк" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "[форкнут] репозиторий" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "[обновлён] репозиторий" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "[загружен] архив из репозитория" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "[удален] репозиторий" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "[создан] пользователь" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "[обновлён] пользователь" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "[создана] группа пользователей" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "[обновлена] группа пользователей" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "[комментарий] к ревизии в репозитории" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "[прокомментировано] в запросе на внесение изменений для" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "[закрыт] Pull-запрос для" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "[отправлено] в" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "[внесены изменения с помощью Kallithea] в репозитории" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "[внесены изменения из удалённого репозитория] в репозиторий" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "[внесены изменения] из" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "[добавлен в наблюдения] репозиторий" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "[удалён из наблюдения] репозиторий" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr " и на %s больше" -#: kallithea/lib/helpers.py:1128 -#: kallithea/templates/compare/compare_diff.html:71 -#: kallithea/templates/pullrequests/pullrequest_show.html:337 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "Нет файлов" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "новый файл" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "изменён" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "удалён" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "переименован" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1469 +#: kallithea/lib/helpers.py:1230 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1257,7 +1336,7 @@ "переименован из файловой системы. Пожалуйста, перезапустите приложение " "для сканирования репозиториев" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1265,7 +1344,7 @@ msgstr[1] "%d лет" msgstr[2] "%d года" -#: kallithea/lib/utils2.py:435 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1273,7 +1352,7 @@ msgstr[1] "%d месяца" msgstr[2] "%d месяцев" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1281,7 +1360,7 @@ msgstr[1] "%d дня" msgstr[2] "%d дней" -#: kallithea/lib/utils2.py:437 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1289,7 +1368,7 @@ msgstr[1] "%d часов" msgstr[2] "%d часа" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1297,7 +1376,7 @@ msgstr[1] "%d минут" msgstr[2] "%d минуты" -#: kallithea/lib/utils2.py:439 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1305,702 +1384,363 @@ msgstr[1] "%d секунды" msgstr[2] "%d секунды" -#: kallithea/lib/utils2.py:455 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "в %s" -#: kallithea/lib/utils2.py:457 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "%s назад" -#: kallithea/lib/utils2.py:459 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "в %s и %s" -#: kallithea/lib/utils2.py:462 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "%s и %s назад" -#: kallithea/lib/utils2.py:465 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "прямо сейчас" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "Репозитарий - нет доступа" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "Репозитарий - доступ на чтение" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "Репозитарий - доступ на запись" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "Репозитарий - администрирование" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "Группа Репозиториев - нет доступа" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "Группа Репозиториев - доступ на чтение" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "Группа Репозиториев - доступ на запись" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "Группа Репозиториев - администрирование" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1669 -msgid "Kallithea Administrator" -msgstr "Администратор Kallithea" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "Создание репозиториев отключено" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "Создание репозиториев включено" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "Возможность создавать форк репозитория отключена" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "Возможность создавать форк репозитория включена" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "Регистрация отключена" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "Регистрация нового пользователя в Kallithea с ручной активацией" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "Регистрация нового пользователя в Kallithea с автоматической активацией" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "Не просмотрено" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2237 -msgid "Approved" -msgstr "Одобрено" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2238 -msgid "Rejected" -msgstr "Отклонено" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "На рассмотрении" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1518 -msgid "top level" -msgstr "верхний уровень" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "Группа Репозиториев - нет доступа" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "Группа репозиториев - доступ на чтение" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "Группа репозиториев - доступ на запись" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "Группа репозиториев - администрирование" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "Группа пользователей - нет доступа" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "Группа пользователей - доступ на чтение" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "Группа пользователей - доступ на запись" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "Группа пользователей - администрирование" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "Создание групп репозиториев отключено" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "Создание групп репозиториев включено" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "Создание групп пользователей отключено" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "Создание групп пользователей включено" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1701 -msgid "Registration disabled" -msgstr "Регистрация отключена" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "Регистрация пользователя с ручной активацией учётной записи" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "Регистрация пользователя с автоматической активацией" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1695 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1696 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "на строке %s" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "[Упоминание]" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "верхний уровень" + +#: kallithea/model/db.py:1715 +msgid "Kallithea Administrator" +msgstr "Администратор Kallithea" + +#: kallithea/model/db.py:1717 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 +#: kallithea/model/db.py:1718 msgid "Default user has read access to new repositories" msgstr "Неавторизованные пользователи имеют право чтения новых репозиториев" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1719 msgid "Default user has write access to new repositories" msgstr "Неавторизованные пользователи имеют право записи в новые репозитории" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1720 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1722 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 +#: kallithea/model/db.py:1723 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1724 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1725 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1727 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1728 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1729 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1730 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1732 msgid "Only admins can create repository groups" msgstr "Только администраторы могут создавать группы" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1733 #, fuzzy msgid "Non-admins can create repository groups" msgstr "Создана новая группа репозиториев %s" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1735 #, fuzzy msgid "Only admins can create user groups" msgstr "Создавать группы пользователей" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1736 #, fuzzy msgid "Non-admins can create user groups" msgstr "Создавать группы пользователей" -#: kallithea/model/db.py:1692 +#: kallithea/model/db.py:1738 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1693 +#: kallithea/model/db.py:1739 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1741 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1742 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1744 #, fuzzy msgid "Only admins can fork repositories" msgstr "Местонахождение репозиториев" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1745 #, fuzzy msgid "Non-admins can fork repositories" msgstr "Сбросить кэш для всех репозиториев" -#: kallithea/model/db.py:1702 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "Регистрация отключена" + +#: kallithea/model/db.py:1748 #, fuzzy msgid "User registration with manual account activation" msgstr "Регистрация пользователя с ручной активацией учётной записи" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1749 #, fuzzy msgid "User registration with automatic account activation" msgstr "Регистрация пользователя с автоматической активацией" -#: kallithea/model/db.py:2236 +#: kallithea/model/db.py:2276 #, fuzzy msgid "Not reviewed" msgstr "Не просмотрено" -#: kallithea/model/db.py:2239 +#: kallithea/model/db.py:2277 #, fuzzy msgid "Under review" msgstr "На рассмотрении" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2278 +#, fuzzy +#| msgid "Approved" +msgid "Not approved" +msgstr "Одобрено" + +#: kallithea/model/db.py:2279 +msgid "Approved" +msgstr "Одобрено" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "Пожалуйста, введите логин" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Введите значение длиной не менее %(min)i символов" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "Пожалуйста, введите пароль" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "Введите не менее %(min)i символов" -#: kallithea/model/forms.py:165 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:240 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s оставил комментарий к набору изменений %(age)s" -#: kallithea/model/notification.py:255 +#: kallithea/model/notification.py:241 #, python-format msgid "%(user)s sent message %(age)s" msgstr "%(user)s отправил сообщение %(age)s" -#: kallithea/model/notification.py:256 +#: kallithea/model/notification.py:242 #, python-format msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s упомянул вас %(age)s" -#: kallithea/model/notification.py:257 +#: kallithea/model/notification.py:243 #, python-format msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s зарегистрировался в Kallithea %(age)s" -#: kallithea/model/notification.py:258 +#: kallithea/model/notification.py:244 #, python-format msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s открыл новый pull-запрос %(age)s" -#: kallithea/model/notification.py:259 +#: kallithea/model/notification.py:245 #, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s оставил комментарий к pull-запросу %(age)s" -#: kallithea/model/notification.py:266 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s оставил комментарий к набору изменений %(when)s" -#: kallithea/model/notification.py:267 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s отправил сообщение %(when)s" -#: kallithea/model/notification.py:268 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s упомянул вас %(when)s" -#: kallithea/model/notification.py:269 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s зарегистрировался в Kallithea %(when)s" -#: kallithea/model/notification.py:270 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s открыл новый pull-запрос %(when)s" -#: kallithea/model/notification.py:271 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s оставил комментарий к pull-запросу %(when)s" -#: kallithea/model/notification.py:302 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:288 +#, fuzzy, python-format +#| msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "[прокомментировано] в запросе на внесение изменений для" + +#: kallithea/model/notification.py:291 #, python-format msgid "New user %(new_username)s registered" msgstr "Новый пользователь \"%(new_username)s\" зарегистрирован" +#: kallithea/model/notification.py:293 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:307 -#, fuzzy, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "%(user)s просит вас рассмотреть pull request #%(pr_id)s: %(pr_title)s" - -#: kallithea/model/notification.py:308 -#, fuzzy, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "[прокомментировано] в запросе на внесение изменений для" - -#: kallithea/model/notification.py:321 msgid "Closing" msgstr "Закрыт" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, fuzzy, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "%(user)s просит вас рассмотреть pull request #%(pr_id)s: %(pr_title)s" -#: kallithea/model/scm.py:708 +#: kallithea/model/pull_request.py:211 +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Cannot create empty pull request" +msgstr "Ошибка при создании pull-запроса: %s" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +#, fuzzy +#| msgid "Confirm to delete this pull request" +msgid "You are not authorized to create the pull request" +msgstr "Подтвердите удаление этого pull-request'а" + +#: kallithea/model/pull_request.py:341 +#, fuzzy +#| msgid "Missing changesets since the previous pull request:" +msgid "Missing changesets since the previous iteration:" +msgstr "Отсутствующие ревизии относительно предыдущего pull-запроса:" + +#: kallithea/model/pull_request.py:348 +#, fuzzy, python-format +#| msgid "New changesets on %s %s since the previous pull request:" +msgid "New changesets on %s %s since the previous iteration:" +msgstr "Новые ревизии на %s %s относительно предыдущего pull-запроса:" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, fuzzy, python-format +#| msgid "" "This pull request is based on another %s revision and there is no +#| simple " "diff." +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "Этот pull-запрос основан на другой ревизии %s, простой diff невозможен." + +#: kallithea/model/pull_request.py:364 +#, fuzzy, python-format +#| msgid "No changes found on %s %s since previous version." +msgid "No changes found on %s %s since previous iteration." +msgstr "Нет изменений на %s %s относительно предыдущей версии." + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "последняя версия" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "Регистрация нового пользователя" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 #, fuzzy msgid "You can't remove this user since it is crucial for the entire application" msgstr "" "Вы не можете удалить пользователя, поскольку это критично для работы " "всего приложения" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -2009,7 +1749,7 @@ "Пользователь \"%s\" всё ещё является владельцем %s репозиториев и поэтому" " не может быть удалён. Смените владельца или удалите эти репозитории: %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" @@ -2019,7 +1759,7 @@ "поэтому не может быть удалён. Смените владельца или удалите данные " "группы: %s" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -2029,37 +1769,37 @@ "поэтому не может быть удалён. Смените владельца или удалите данные " "группы: %s" -#: kallithea/model/user.py:368 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "Ссылка сброса пароля" -#: kallithea/model/user.py:418 +#: kallithea/model/user.py:413 #, fuzzy msgid "Password reset notification" msgstr "Ссылка сброса пароля" -#: kallithea/model/user.py:419 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "Значение не может быть пустым списком" -#: kallithea/model/validators.py:96 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Пользователь с именем \"%(username)s\" уже существует" -#: kallithea/model/validators.py:98 +#: kallithea/model/validators.py:75 #, fuzzy, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Имя \"%(username)s\" недопустимо" -#: kallithea/model/validators.py:100 +#: kallithea/model/validators.py:77 #, fuzzy msgid "" "Username may only contain alphanumeric characters underscores, periods or" @@ -2069,25 +1809,25 @@ "подчеркивания, точки и тире; а так же должно начинаться с буквы, цифры " "либо с символа подчеркивания" -#: kallithea/model/validators.py:127 +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:134 +#: kallithea/model/validators.py:111 #, python-format msgid "Username %(username)s is not valid" msgstr "Имя \"%(username)s\" недопустимо" -#: kallithea/model/validators.py:154 +#: kallithea/model/validators.py:131 msgid "Invalid user group name" msgstr "Неверное имя группы пользователей" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:132 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Группа пользователей \"%(usergroup)s\" уже существует" -#: kallithea/model/validators.py:157 +#: kallithea/model/validators.py:134 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -2095,107 +1835,107 @@ "имя группы пользователей может содержать только буквы, цифры, символы " "подчеркивания, точки и тире; а так же должно начинаться с буквы или цифры" -#: kallithea/model/validators.py:197 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "Невозможно использовать эту группу как родителя" -#: kallithea/model/validators.py:198 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Группа \"%(group_name)s\" уже существует" -#: kallithea/model/validators.py:200 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Репозитарий с именем \"%(group_name)s\" уже существует" -#: kallithea/model/validators.py:258 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "Недопустимые символы (не ascii) в пароле" -#: kallithea/model/validators.py:273 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "Неверно задан старый пароль" -#: kallithea/model/validators.py:289 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "Пароли не совпадают" -#: kallithea/model/validators.py:304 +#: kallithea/model/validators.py:279 #, fuzzy msgid "Invalid username or password" msgstr "неверный пароль" -#: kallithea/model/validators.py:335 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "Несовпадение токенов" -#: kallithea/model/validators.py:351 +#: kallithea/model/validators.py:326 #, fuzzy, python-format msgid "Repository name %(repo)s is not allowed" msgstr "Имя репозитория %(repo)s запрещено" -#: kallithea/model/validators.py:353 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Репозитарий %(repo)s уже существует" -#: kallithea/model/validators.py:354 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Репозитарий \"%(repo)s\" уже существует в группе \"%(group)s\"" -#: kallithea/model/validators.py:356 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Группа репозиториев \"%(repo)s\" уже существует" -#: kallithea/model/validators.py:470 +#: kallithea/model/validators.py:449 #, fuzzy msgid "Invalid repository URL" msgstr "приватный репозиторий" -#: kallithea/model/validators.py:471 +#: kallithea/model/validators.py:450 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:496 +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "Тип форка будет совпадать с родительским" -#: kallithea/model/validators.py:511 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "У вас недостаточно прав для создания репозиториев в этой группе" -#: kallithea/model/validators.py:513 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "недостаточно прав для создания репозитория в корневом каталоге" -#: kallithea/model/validators.py:563 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "У Вас недостаточно привилегий для создания группы в этом месте" -#: kallithea/model/validators.py:604 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "Данное имя пользователя или группы пользователей недопустимо" -#: kallithea/model/validators.py:697 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "Этот путь ошибочен" -#: kallithea/model/validators.py:714 +#: kallithea/model/validators.py:692 #, fuzzy msgid "This email address is already in use" msgstr "Этот E-mail уже занят" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:712 #, fuzzy, python-format msgid "Email address \"%(email)s\" not found" msgstr "\"%(email)s\" не существует." -#: kallithea/model/validators.py:771 +#: kallithea/model/validators.py:749 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -2203,398 +1943,408 @@ "Для входа по LDAP должно быть указано значение аттрибута CN - это " "эквивалент имени пользователя" -#: kallithea/model/validators.py:783 +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Пожалуйста, введите существующий IPv4 или IPv6 адре" -#: kallithea/model/validators.py:784 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" "Значение маски подсети должно быть в пределах от 0 до 32 (%(bits)r - " "неверно)" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" "Ключевое имя может только состоять из букв, символа подчеркивания, тире " "или чисел" -#: kallithea/model/validators.py:831 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "Файла нет в каталоге" -#: kallithea/model/validators.py:847 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "О программе" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "Панель управления" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "фильтр..." - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "репозитории" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "Добавить репозиторий" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "Добавить группу репозиториев" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "Вы имеете администраторские права на эту группу и можете редактировать её" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "Изменить группу репозиториев" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "Имя группы" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +#, fuzzy +#| msgid "Repository group" +msgid "Repository Group" +msgstr "Группа репозиториев" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "Описание" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "Имя" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "Репозиторий" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "Последнее изменение" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" msgstr "Состояние" -#: kallithea/templates/index_base.html:132 +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:244 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "Владелец" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "По возрастанию" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "По убыванию" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "Репозитарии не найдены." - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "Ошибка данных." - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "Загрузка..." - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:414 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "Войти" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "Войти в %s" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "Имя пользователя" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "Пароль" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "Запомнить" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "Забыли пароль?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "Нет аккаунта?" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "Войти" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "Сброс пароля" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 #, python-format msgid "Reset Your Password to %s" msgstr "Сброс пароля для %s" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 msgid "Reset Your Password" msgstr "Сброс пароля" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "Почтовый адрес" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "Капча" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 msgid "Send Password Reset Email" msgstr "Послать ссылку сброса пароля" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 #, fuzzy msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "Ссылка для сброса пароля была отправлена на соответствующий e-mail." -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 #, fuzzy msgid "New Password" msgstr "Новый пароль" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 #, fuzzy msgid "Confirm New Password" msgstr "Подтвердите новый пароль" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "Регистрация" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "Регистра на %s" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "Повторите пароль" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "Имя" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "Фамилия" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "E-mail" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "Пожалуйста, подождите, пока администратор подтвердит Вашу регистрацию." -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "Ветки ещё не созданы" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "Метки отсутсвуют" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "Закладок ещё нет" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 msgid "Admin Journal" msgstr "Журнал администратора" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "Фильтр журнала..." #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 msgid "Filter" msgstr "Отфильтровать" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2603,59 +2353,60 @@ msgstr[2] "%s записи" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "Действие" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "Репозиторий" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "Дата" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "С IP" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "Действия ещё не производились" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "Настройки аутентификации" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "Аутентификация" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "Плагины аутентификации" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "Включенные плагины" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 #, fuzzy msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " @@ -2664,90 +2415,117 @@ "Список плагинов, разделенных запятой. Kallithea будет пробовать " "аутентифицировать пользователя в порядке указания плагинов" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "Доступные встроенные плагины" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "Плагин" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "Сохранить" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 msgid "Repository Defaults" msgstr "Значения по умолчанию" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "Тип" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 msgid "Private repository" msgstr "Приватный репозиторий" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "Приватные репозитории видны только их участникам." -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 msgid "Enable statistics" msgstr "Включить статистику" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 msgid "Enable statistics window on summary page." msgstr "Включить окно статистики на странице «Общие сведения»." -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 msgid "Enable downloads" msgstr "Включить скачивание" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 msgid "Enable download menu on summary page." msgstr "Включить меню скачивания на странице «Общие сведения»." -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 msgid "Enable locking" msgstr "Включить блокирование" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "Включить автоблокировку для репозитория." @@ -2756,325 +2534,478 @@ msgid "Edit Gist" msgstr "Правка gist-записи" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "Описание..." -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" msgstr "Истекает" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 #, fuzzy msgid "Never" msgstr "никогда" -#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "Обновить" -#: kallithea/templates/admin/gists/edit.html:147 -#: kallithea/templates/changeset/changeset_file_comment.html:105 +#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "Отмена" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, python-format msgid "Private Gists for User %s" msgstr "Приватная gist-запись для пользователя %s" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, python-format msgid "Public Gists for User %s" msgstr "Публичная gist-запись для пользователя %s" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "Публичные gist-записи" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "Создать новую gist-запись" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "Создано" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "Gist-записи отсутствуют" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "Сброс" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "Gist" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "URL" +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:31 -#: kallithea/templates/changeset/changeset_file_comment.html:95 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "Удалить" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "Подтвердите удаление этой gist-записи" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "Редактировать" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "Редактировать" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "Показать только текст" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "создана" -#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "Показать только текст" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:431 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "Мой Аккаунт" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "Профиль" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 #, fuzzy msgid "Email Addresses" msgstr "Новый E-mail" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "API-ключи" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 #, fuzzy msgid "Owned Repositories" msgstr "репозитории" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 #, fuzzy msgid "Watched Repositories" msgstr "Создать репозитории" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 #, fuzzy msgid "Show Permissions" msgstr "Скопировать привилегии" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, fuzzy, python-format msgid "Confirm to reset this API key: %s" msgstr "Подтвердите сброс этого API-ключа: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 #, fuzzy msgid "Expired" msgstr "Истекает" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, fuzzy, python-format msgid "Confirm to remove this API key: %s" msgstr "Подтвердите удаление этого API-ключа: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 #, fuzzy msgid "Remove" msgstr "Удалено" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 #, fuzzy msgid "No additional API keys specified" msgstr "Дополнительные адреса e-mail не указаны" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 #, fuzzy msgid "New API key" msgstr "Ключ" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "Добавить" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "Основной" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "Подтвердите удаление E-mail: %s" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 msgid "No additional emails specified." msgstr "Нет дополнительных адресов e-mail." -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "Новый E-mail" @@ -3082,131 +3013,174 @@ msgid "Change Your Account Password" msgstr "Смена пароля" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "Текущий пароль" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "Новый пароль" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "Подтвердите новый пароль" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +#, fuzzy +msgid "Current IP" +msgstr "текущий IP-адрес" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, fuzzy, python-format +#| msgid "Change your avatar at" +msgid "Change %s avatar at" msgstr "Измените аватар через сайт" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "Используется" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "Аватары отключены" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "Не указан email. Пожалуйста, обновите ваш email." - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -#, fuzzy -msgid "Current IP" -msgstr "текущий IP-адрес" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 msgid "Repositories You Own" msgstr "Репозитории, где Вы — владелец" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "Записи не найдены." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" +msgstr "Имя" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 msgid "Repositories You are Watching" msgstr "Репозитории, за которыми Вы наблюдаете" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "Мои уведомления" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "Всё" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "Комментарии" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "Pull-запросы" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 msgid "Mark All Read" msgstr "Отметить все как прочтённые" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +#, fuzzy +#| msgid "Mark All Read" +msgid "Mark as read" +msgstr "Отметить все как прочтённые" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "Уведомлений нет" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 msgid "Show Notification" msgstr "Показать уведомление" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:430 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "Уведомления" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 msgid "Default Permissions" msgstr "Стандартные привилегии" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "Белый список IP" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "Анонимный доступ" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " @@ -3216,24 +3190,30 @@ "репозитория. Учтите, что ранее установленные привилегии по умолчанию " "будут сброшены" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 #, fuzzy msgid "Apply to all existing repositories" msgstr "Существующий репозиторий?" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 msgid "Permissions for the Default user on new repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 msgid "Repository group" msgstr "Группа репозиториев" -#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " @@ -3243,21 +3223,26 @@ "репозиториев. Учтите, что ранее установленные привилегии по умолчанию для" " групп репозиториев будут сброшены" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 #, fuzzy msgid "Apply to all existing repository groups" msgstr "Удалить эту группу репозиториев" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "Группа пользователей" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 #, fuzzy msgid "" "All default permissions on each user group will be reset to chosen " @@ -3268,107 +3253,136 @@ "пользователей. Учтите, что ранее установленные привилегии по умолчанию " "для групп пользователей будут сброшены" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 #, fuzzy msgid "Top level repository creation" msgstr "Создание репозитория" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 msgid "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 msgid "User group creation" msgstr "Создание групп пользователей" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "Создание форка репозитория" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "Регистрация" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "Активация сторонней учетной записи" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, fuzzy, python-format msgid "Confirm to delete this IP address: %s" msgstr "Подтвердите удаление IP %s" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 msgid "All IP addresses are allowed." msgstr "Все IP-адреса разрешены." -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "Новый IP-адрес" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "Группы репозиториев" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "Имя группы" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "Родительская группа" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "" @@ -3377,31 +3391,42 @@ msgid "%s Repository Group Settings" msgstr "Настройки группы репозиториев %s" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "Добавить подгруппу" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "Настройки" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "Дополнительно" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "Привилегии" @@ -3425,12 +3450,14 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "Создано" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3442,8 +3469,30 @@ msgid "Delete this repository group" msgstr "Удалить эту группу репозиториев" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "disabled" +msgid "Visible" +msgstr "отключено" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "Add Repository" +msgid "Add repos" +msgstr "Добавить репозиторий" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#, fuzzy +#| msgid "Add user group" +msgid "Add/Edit groups" +msgstr "Добавить группу пользователей" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 #, fuzzy msgid "User/User Group" @@ -3451,8 +3500,8 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy @@ -3461,36 +3510,36 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy msgid "Revoke" msgstr "отозвать" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "Добавить новый" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #, fuzzy msgid "Apply to children" msgstr "применить к дочерним" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" @@ -3498,69 +3547,81 @@ "Включить автоблокировку для группы. Эта опция будет применена ко всем " "дочерним группам и репозиториям" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "Удалить эту группу" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "Подтвердите удаление этой группы пользователей" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" +#, fuzzy, python-format +#| msgid "Repository Group: %s" +msgid "Repository group %s" +msgstr "Группа репозиториев: %s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "Домой" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "с" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 msgid "Repository Groups Administration" msgstr "Администрирование групп репозиториев" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 msgid "Number of Top-level Repositories" msgstr "Число репозиториев верхнего уровня" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 #, fuzzy msgid "Clone remote repository" msgstr "[создан] репозиторий" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "Короткое и осмысленное. Для развернутого описания используйте файл README." -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "Опционально выбрать группу, в которую поместить данный репозиторий." -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "Тип создаваемого репозитория." -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "Ревизия для выгрузки" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3589,93 +3650,114 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, python-format msgid "%s Repository Settings" msgstr "Настройки репозитория %s" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 msgid "Extra Fields" msgstr "Дополнительные поля" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "Удалённый" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "Статистика" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 msgid "Parent" msgstr "Родительская группа" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "Набор" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 msgid "Manually set this repository as a fork of another from the list." msgstr "Вручную сделать этот репозиторий форком выбранного из списка." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 msgid "Public Journal Visibility" msgstr "Доступ к публичному журналу" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "Удалить из общедоступного журнала" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 msgid "Add to Public Journal" msgstr "Добавить в публичный журнал" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "" -"Все производимые с этим репозиторием действия будут отображаться в публичном " -"журнале." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +"Все производимые с этим репозиторием действия будут отображаться в " +"публичном журнале." + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 msgid "Change Locking" msgstr "Включить блокирование" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 msgid "Confirm to unlock repository." msgstr "Подтвердите снятие блокировки с репозитория." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 msgid "Unlock Repository" msgstr "Разблокировать репозиторий" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 msgid "Confirm to lock repository." msgstr "Подтвердите блокировку репозитория." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 msgid "Lock Repository" msgstr "Заблокировать репозиторий" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "Репозиторий не заблокирован" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3683,17 +3765,21 @@ "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Подтвердите удаление этого репозитория: %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 msgid "Delete this Repository" msgstr "Удалить этот репозиторий" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" @@ -3701,15 +3787,18 @@ msgstr[1] "Данный репозиторий имеет %s копии" msgstr[2] "Данный репозиторий имеет %s копий" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "Отсоединить fork'и" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "Удалить fork'и" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3720,106 +3809,116 @@ msgid "Invalidate Repository Cache" msgstr "Сбросить кэш репозитория" -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "Ручной сброс кэша репозитория. При первом доступе кэш восстановится." -#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 msgid "List of Cached Values" msgstr "Список кешированных значений" -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "Prefix" msgstr "Префикс" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "Ключ" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "Активный" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "Подтвердите удаление этого поля: %s" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "Ключ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "Имя поля" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "Введите краткое имя поля" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "Описание поля" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "Введите описание поля" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "Дополнительные поля отключены." -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "приватный репозиторий" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "[forked] repository" +msgid "Fork of repository" +msgstr "[форкнут] репозиторий" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "Репозиторий %s создан" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 #, fuzzy msgid "Pull Changes from Remote Repository" msgstr "[внесены изменения из удалённого репозитория] в репозиторий" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 #, fuzzy msgid "Confirm to pull changes from remote repository." msgstr "Подтвердите скачивание изменений." -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 #, fuzzy msgid "Permanent Repository ID" msgstr "приватный репозиторий" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3829,37 +3928,37 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "[создан] репозиторий" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 #, fuzzy msgid "Repository URL" msgstr "Репозиторий" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" "Ревизия по умолчанию, из которой будет производиться выгрузка файлов при " "скачивании" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "Изменить владельца репозитория." +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3872,277 +3971,331 @@ msgstr "Подтвердите сброс статистики." #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 msgid "Repositories Administration" msgstr "Администрирование репозиториев" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 msgid "Settings Administration" msgstr "Администрирование настроек" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "Хуки" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "Отправить" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "Брендинг сайта" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "Приветствие для HTTP-аутентификации" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems like Google" +" Analytics or Piwik, but also to perform " +"instance-specific customizations like adding a " +"project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 msgid "Save Settings" msgstr "Сохранить настройки" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 msgid "Custom Hooks" msgstr "Пользовательские хуки" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "Не удалось удалить хук" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Rescan option" +msgid "Rescan options" msgstr "Опции пересканирования" -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 #, fuzzy msgid "Delete records of missing repositories" msgstr "Поиск по репозиториям" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 msgid "" "Check this option to remove all comments, pull requests and other records" " related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "Сбросить кэш для всех репозиториев" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "Сбросить кэш для всех репозиториев." -#: kallithea/templates/admin/settings/settings_mapping.html:23 +#: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 msgid "Install Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 +#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " "not seem to come from Kallithea. WARNING: This operation will destroy any" " custom git hooks you may have deployed by hand!" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/templates/admin/settings/settings_mapping.html:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "Опции создания индекса" -#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 msgid "Build from scratch" msgstr "Сборка с нуля" -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "Перестроить индекс" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Kallithea version" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." msgstr "" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" -msgstr "Версия Git" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 +msgid "Kallithea configuration file" +msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:10 -msgid "Upgrade info endpoint" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 +msgid "Git version" +msgstr "Версия Git" + +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 +msgid "Upgrade info endpoint" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "Веб" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "Запрашивать SSL для операций с VCS" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "Показывать размер репозитория после отправки" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "Логировать пользовательские команды отправки" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "Логировать пользовательские команды получения" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "Обновлять репозиторий после отправки (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 msgid "Mercurial extensions" msgstr "Расширения Mercurial" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 msgid "Enable largefiles extension" msgstr "Включить поддержку больших файлов" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 msgid "Enable hgsubversion extension" msgstr "Включить поддержку hgsubversion" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 msgid "Location of repositories" msgstr "Местонахождение репозиториев" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting" " take effect." @@ -4150,37 +4303,44 @@ "Нажмите для разблокирования. Изменения вступят в силу после перезагрузки " "Kallithea." -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "Главное" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "Использовать дополнительные поля в репозиториях" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "Позволяет хранить дополнительные поля в репозиториях." -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "Отображать версию Kallithea" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4197,102 +4357,126 @@ "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +msgid "Clone URL" +msgstr "Ссылка для клонирования" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." "\n" -" The following " +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user" +" username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "Элементы панели" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repository Size" +msgid "Repository page size" +msgstr "Размер репозитория" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 msgid "Icons" msgstr "Иконки" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 msgid "Show public repository icon on repositories" msgstr "Показывать иконки публичных репозиториев" +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 +msgid "Show private repository icon on repositories" +msgstr "Показывать иконки приватных репозиториев" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "Показывать иконки приватных репозиториев" - -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 msgid "Show public/private icons next to repository names." msgstr "Показывать иконки публичных репозиториев." -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 #, fuzzy msgid "Meta Tagging" msgstr "Метатегирование" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "Добавить группу пользователей" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 #, fuzzy msgid "Show Members" msgstr "участники" @@ -4303,13 +4487,15 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "Участники" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "Подтвердите удаление следующей группы пользователей: %s" @@ -4318,48 +4504,59 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "Нет участников" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "Выбранные участники группы" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "Доступные участники" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 msgid "User Groups Administration" msgstr "Администрирование групп пользователей" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "Добавить пользователя" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "Пользователи" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "Подтверждение пароля" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "" @@ -4369,12 +4566,14 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "" @@ -4383,7 +4582,8 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "Подтвердите удаление пользователя %s" @@ -4392,404 +4592,459 @@ msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "Подтвердите новый пароль" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 msgid "Users Administration" msgstr "Администрирование пользователей" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "Экземпляр сервера: %s" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "Репозиторий Mercurial" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "Git репозиторий" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 msgid "Create Fork" msgstr "Создать форк" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "Общие сведения" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "История изменений" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "Файлы" -#: kallithea/templates/base/base.html:142 -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 msgid "Options" msgstr "Опции" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:147 +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 msgid "Compare Fork" msgstr "Сравнить форк" -#: kallithea/templates/base/base.html:154 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 msgid "Compare" msgstr "Сравнить" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:331 +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 msgid "Search" msgstr "Поиск" -#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:155 +#: kallithea/tests/data/templates/base/base.html.py:399 msgid "Unlock" msgstr "Разблокировать" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:157 +#: kallithea/tests/data/templates/base/base.html.py:405 msgid "Lock" msgstr "Заблокировать" -#: kallithea/templates/base/base.html:170 +#: kallithea/templates/base/base.html:165 +#: kallithea/tests/data/templates/base/base.html.py:413 msgid "Follow" msgstr "Наблюдать" -#: kallithea/templates/base/base.html:171 +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 msgid "Unfollow" msgstr "Не наблюдать" -#: kallithea/templates/base/base.html:174 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 msgid "Fork" msgstr "Форк" -#: kallithea/templates/base/base.html:175 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/base/base.html:170 +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 msgid "Create Pull Request" msgstr "Создать Pull запрос" -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "Показать pull-запросы для %s" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 msgid "Switch To" msgstr "Переключиться на" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:485 +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:305 +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "Показать последнюю активность" -#: kallithea/templates/base/base.html:311 -#: kallithea/templates/base/base.html:312 +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 msgid "Public journal" msgstr "Общедоступный журнал" -#: kallithea/templates/base/base.html:317 +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 msgid "Show public gists" msgstr "Показать публичные записи" -#: kallithea/templates/base/base.html:318 +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 msgid "Gists" msgstr "Gist" -#: kallithea/templates/base/base.html:322 +#: kallithea/templates/base/base.html:311 +#: kallithea/tests/data/templates/base/base.html.py:525 msgid "All Public Gists" msgstr "Все публичные Gist-записи" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 msgid "My Public Gists" msgstr "Мои публичные Gist-записи" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 msgid "My Private Gists" msgstr "Мои приватные Gist-записи" -#: kallithea/templates/base/base.html:330 +#: kallithea/templates/base/base.html:319 +#: kallithea/tests/data/templates/base/base.html.py:540 msgid "Search in repositories" msgstr "Поиск по репозиториям" -#: kallithea/templates/base/base.html:353 -#: kallithea/templates/base/base.html:354 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 msgid "My Pull Requests" msgstr "Мои Pull-запросы" -#: kallithea/templates/base/base.html:377 +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 msgid "Not Logged In" msgstr "Не авторизован" -#: kallithea/templates/base/base.html:384 +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 msgid "Login to Your Account" msgstr "Авторизоваться" -#: kallithea/templates/base/base.html:407 -msgid "Forgot password ?" +#: kallithea/templates/base/base.html:385 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" msgstr "Забыли пароль?" -#: kallithea/templates/base/base.html:434 +#: kallithea/templates/base/base.html:389 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "Нет аккаунта?" + +#: kallithea/templates/base/base.html:407 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "Выход" -#: kallithea/templates/base/base.html:615 -msgid "Keyboard shortcuts" -msgstr "" - -#: kallithea/templates/base/base.html:624 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 #, fuzzy msgid "Inherit defaults" msgstr "Значения по умолчанию" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "Создать репозитории" +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 +msgid "Select this option to allow repository creation for this user" +msgstr "Опция разрешает пользователю создавать репозитарии" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "Опция разрешает пользователю создавать репозитарии" - -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "Создавать группы пользователей" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "Опция разрешает пользователю создавать группы пользователей" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "Создавать fork от репозиториев" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "" "Выберите эту опцию чтобы разрешить данному пользователю создавать fork'и " "репозиториев" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "Показать" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "Привилегии еще не назначены" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "Привилегия" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "Изменить привилегии" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -msgid "Add Another Comment" -msgstr "Добавить ещё один комментарий" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "Отменить наблюдение за репозиторием" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "Наблюдать за репозиторием" - #: kallithea/templates/base/root.html:25 -msgid "Group" -msgstr "Группа" +#: kallithea/tests/data/templates/base/root.html.py:85 +msgid "Add Another Comment" +msgstr "Добавить ещё один комментарий" #: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "участники" +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 +msgid "Stop following this repository" +msgstr "Отменить наблюдение за репозиторием" #: kallithea/templates/base/root.html:27 -msgid "Loading ..." -msgstr "Загрузка..." +#: kallithea/tests/data/templates/base/root.html.py:89 +msgid "Start following this repository" +msgstr "Наблюдать за репозиторием" #: kallithea/templates/base/root.html:28 +#: kallithea/tests/data/templates/base/root.html.py:91 +msgid "Group" +msgstr "Группа" + +#: kallithea/templates/base/root.html:29 +#: kallithea/tests/data/templates/base/root.html.py:93 +msgid "members" +msgstr "участники" + +#: kallithea/templates/base/root.html:30 +#: kallithea/tests/data/templates/base/root.html.py:95 +msgid "Loading ..." +msgstr "Загрузка..." + +#: kallithea/templates/base/root.html:31 +#: kallithea/tests/data/templates/base/root.html.py:97 msgid "loading ..." msgstr "загрузка..." -#: kallithea/templates/base/root.html:29 +#: kallithea/templates/base/root.html:32 +#: kallithea/tests/data/templates/base/root.html.py:99 msgid "Search truncated" msgstr "Поиск усечен" -#: kallithea/templates/base/root.html:30 +#: kallithea/templates/base/root.html:33 +#: kallithea/tests/data/templates/base/root.html.py:101 msgid "No matching files" msgstr "Нет совпадений" -#: kallithea/templates/base/root.html:31 +#: kallithea/templates/base/root.html:34 +#: kallithea/tests/data/templates/base/root.html.py:103 #, fuzzy msgid "Open New Pull Request from {0}" msgstr "Комментарий в pull-запросе" -#: kallithea/templates/base/root.html:32 +#: kallithea/templates/base/root.html:35 +#: kallithea/tests/data/templates/base/root.html.py:105 msgid "Open New Pull Request for {0} → {1}" msgstr "" -#: kallithea/templates/base/root.html:33 +#: kallithea/templates/base/root.html:36 +#: kallithea/tests/data/templates/base/root.html.py:107 #, fuzzy msgid "Show Selected Changesets {0} → {1}" msgstr "Показать выбранные наборы изменений: __S → __E" -#: kallithea/templates/base/root.html:34 +#: kallithea/templates/base/root.html:37 +#: kallithea/tests/data/templates/base/root.html.py:109 msgid "Selection Link" msgstr "Ссылка выбора" -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/base/root.html:38 +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 msgid "Collapse Diff" msgstr "Свернуть сравнение" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:39 +#: kallithea/tests/data/templates/base/root.html.py:113 msgid "Expand Diff" msgstr "Раскрыть сравнение" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:40 +#: kallithea/tests/data/templates/base/root.html.py:115 msgid "Failed to revoke permission" msgstr "Не удалось отозвать привилегии" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "Подтвердите удаление привилегии для {0}: {1} ?" -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "включено" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "отключено" - -#: kallithea/templates/base/root.html:42 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "Выбрать набор изменений" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 msgid "Specify changeset" msgstr "Выбрать набор изменений" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "Закладки %s" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "Автор" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "Ревизия" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "Ветки %s" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "По возрастанию" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "По убыванию" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "Записи не найдены." + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "Ошибка данных." + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." +msgstr "Загрузка..." #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "Логи изменений %s" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" @@ -4797,32 +5052,41 @@ msgstr[1] "Показаны %d из %d ревизий" msgstr[2] "Показаны %d из %d ревизий" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "Очистить выбор" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 msgid "Go to tip of repository" msgstr "Перейти на верхушку репозитория" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "Сравнить fork с %s" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "Сравнить форк с родительским репозиторием (%s)" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 msgid "Branch filter:" msgstr "Отфильтровать ветку:" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 #, fuzzy, python-format msgid "" "Changeset status: %s by %s\n" @@ -4831,175 +5095,247 @@ "Статус набора изенений: %s⏎\n" "Кликрните, чтобы перейти к соответствующему pull-request'у #%s" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/changelog/changelog_summary_data.html:24 +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 #, fuzzy, python-format msgid "Changeset status: %s by %s" msgstr "Статус набора изменений: %s" -#: kallithea/templates/changelog/changelog.html:116 -#: kallithea/templates/compare/compare_cs.html:63 +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 msgid "Expand commit message" msgstr "" -#: kallithea/templates/changelog/changelog.html:125 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/changelog/changelog.html:116 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "Комментарии отсутствуют" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:57 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "Закладка %s" -#: kallithea/templates/changelog/changelog.html:141 -#: kallithea/templates/changelog/changelog_summary_data.html:63 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#: kallithea/templates/compare/compare_cs.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:203 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "Метка %s" -#: kallithea/templates/changelog/changelog.html:146 -#: kallithea/templates/changelog/changelog_summary_data.html:68 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "Ветка %s" -#: kallithea/templates/changelog/changelog.html:311 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "Изменений ещё нет" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "Удалено" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "Изменено" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:47 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "Добавлено" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "Затрагивает %s файлов" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "Ревизия" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "Возраст" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "Автор" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "Ссылки" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "Добавить или загрузить файлы через Kallithea" -#: kallithea/templates/changelog/changelog_summary_data.html:87 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:93 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 #, fuzzy msgid "Push new repository" msgstr "Отправить новый репозиторий" -#: kallithea/templates/changelog/changelog_summary_data.html:101 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "Существующий репозиторий?" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "%s Изменения" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:39 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "Статут изменений" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "Отобразить в формате diff" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "Применить разностное исправление (Patch diff)" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:75 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "Скачать diff" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 #, fuzzy msgid "Merge" msgstr "свести" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 msgid "Grafted from:" msgstr "Перенесено из:" +#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 +msgid "Transplanted from:" +msgstr "" + #: kallithea/templates/changeset/changeset.html:129 -msgid "Transplanted from:" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 #, fuzzy msgid "Replaced by:" msgstr "Создано" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 #, fuzzy msgid "Preceded by:" msgstr "Создано" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:329 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -5007,9 +5343,12 @@ msgstr[1] "%s файлов изменено" msgstr[2] "%s файла изменено" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:62 -#: kallithea/templates/pullrequests/pullrequest_show.html:331 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -5017,48 +5356,62 @@ msgstr[1] "%s файла изменёно: %s добавления, %s удаления" msgstr[2] "%s файлов изменёно: %s добавлений, %s удалений" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 msgid "Show full diff anyway" msgstr "Показать полный diff" -#: kallithea/templates/changeset/changeset.html:231 -#: kallithea/templates/changeset/changeset.html:268 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 #, fuzzy msgid "No revisions" msgstr "версии" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 #, fuzzy msgid "on pull request" msgstr "Комментарий в pull-запросе" -#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 msgid "No title" msgstr "Нет заголовка" -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 #, fuzzy msgid "on this changeset" msgstr "Нет изменений" -#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 msgid "Delete comment?" msgstr "Удалить комментарий?" -#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 #, fuzzy msgid "Status change" msgstr "Последние изменения" -#: kallithea/templates/changeset/changeset_file_comment.html:59 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 #, fuzzy msgid "Commenting on line." msgstr "Комментарий к строке {1}." -#: kallithea/templates/changeset/changeset_file_comment.html:60 +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 #, fuzzy msgid "" "Comments are in plain text. Use @username inside this text to notify " @@ -5067,48 +5420,60 @@ "Используйте @имя_пользователя в тексте, чтобы отправить оповещение " "указанному пользователю." -#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 msgid "Set changeset status" msgstr "Изменить статус ревизии" -#: kallithea/templates/changeset/changeset_file_comment.html:69 +#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:75 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 msgid "No change" msgstr "Без изменений" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 #, fuzzy msgid "Finish pull request" msgstr "Комментарий в pull-запросе" -#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 msgid "Close" msgstr "Закрыть" -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 msgid "Submitting ..." msgstr "Применение..." -#: kallithea/templates/changeset/changeset_file_comment.html:104 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "Комментировать" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "Вам необходимо авторизоваться, чтобы оставлять комментарии." -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "Авторизоваться сейчас" -#: kallithea/templates/changeset/changeset_file_comment.html:116 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "Скрыть" -#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -5116,7 +5481,8 @@ msgstr[1] "%d комментария" msgstr[2] "%d комментариев" -#: kallithea/templates/changeset/changeset_file_comment.html:129 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, python-format msgid "%d inline" msgid_plural "%d inline" @@ -5124,7 +5490,8 @@ msgstr[1] "%d к строкам" msgstr[2] "%d к строкам" -#: kallithea/templates/changeset/changeset_file_comment.html:130 +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 #, python-format msgid "%d general" msgid_plural "%d general" @@ -5133,108 +5500,170 @@ msgstr[2] "" #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "%s Изменения" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "Статус набора изменений: %s" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "Затронутые файлы" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "файл удалён" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "Неизменный" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 msgid "Deleted" msgstr "Удалён" -#: kallithea/templates/changeset/diff_block.html:57 +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 msgid "Renamed" msgstr "Переименован" -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Неизвестная ревизия %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Безымянный" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "файл удалён" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "Показать полный diff для этого файла" -#: kallithea/templates/changeset/diff_block.html:69 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "Показать полный diff для этого файла" -#: kallithea/templates/changeset/diff_block.html:83 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "Показать комментарии в строках" #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "Нет изменений" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "Предок" - -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "Статус набора изменений: %s" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +#, fuzzy +#| msgid "Common ancestor" +msgid "Merge Ancestor" +msgstr "Общий предок" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:85 +#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 msgid "Show merge diff" msgstr "Показать merge diff" -#: kallithea/templates/compare/compare_cs.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:321 -msgid "Common ancestor" -msgstr "Общий предок" - -#: kallithea/templates/compare/compare_cs.html:99 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:107 +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 msgid "is" msgstr "отстаёт на" -#: kallithea/templates/compare/compare_cs.html:108 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, python-format msgid "%s changesets" msgstr "%s изменений" -#: kallithea/templates/compare/compare_cs.html:109 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 msgid "behind" msgstr "от" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "%s Сравнить" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "" #: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "" #: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5242,115 +5671,190 @@ msgstr[1] "Показать %s commit'а" msgstr[2] "Показать %s commit'ов" -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "Показать полный diff" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "Публичный репозиторий" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "Изменений ещё не было" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "Подписаться на ленту RSS %s" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "Подписаться на ленту Atom %s" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "%(user)s оставил комментарий к набору изменений %(age)s" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "Comment from %s on %s changeset %s" +msgid "Comment on Changeset \"%s\"" msgstr "Комментарий от %s к набору изменений %s %s" -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "Состояние набора изменений изменено на" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset flow" +msgid "Changeset on" +msgstr "Поток изменений" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Ветка" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Последние изменения" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "This pull request has been closed and can not be updated." +msgid "The pull request has been closed." +msgstr "Этот pull-запрос был закрыт и не может быть обновлён." + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "Здравствуйте, %s" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 #, fuzzy msgid "We have received a request to reset the password for your account." msgstr "Мы отправили запрос на создание нового пароля для вашего аккаунта." -#: kallithea/templates/email_templates/password_reset.html:8 +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 msgid "" "This account is however managed outside this system and the password " "cannot be changed here." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:13 +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, fuzzy, python-format +#| msgid "%s mentioned you on %s pull request \"%s\"" +msgid "Mention on Pull Request %s \"%s\" by %s" msgstr "%s упомянул Вас в комментарии к pull-запросу %s \"%s\"" -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, fuzzy, python-format +#| msgid "%s requested your review of %s pull request \"%s\"" +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" msgstr "%s запросил рецензирование pull-запроса %s \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "on pull request" +msgid "Pull request from" +msgstr "Комментарий в pull-запросе" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +#, fuzzy +#| msgid "Date" +msgid "at" +msgstr "Дата" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" +msgstr "" + #: kallithea/templates/email_templates/pull_request_comment.html:4 -#, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "Комментарий закрыл pull-запрос со статусом" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "Комментарий оставлен со статусом" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "Подробнее о пользователе" +#, fuzzy, python-format +#| msgid "%s mentioned you on %s pull request \"%s\"" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "%s упомянул Вас в комментарии к pull-запросу %s \"%s\"" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s from %s#%s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "Pull-запросы %s от %s#%s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "[прокомментировано] в запросе на внесение изменений для" + +#: kallithea/templates/email_templates/registration.html:22 +#, fuzzy +#| msgid "Group name" +msgid "Full Name" +msgstr "Имя группы" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5368,83 +5872,105 @@ msgstr "Сравнение файла %s" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "%s Файлы" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "%s Файлов добавлено" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "Расположение" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "или" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 +#: kallithea/tests/data/templates/files/files_add.html.py:241 #, fuzzy msgid "New file type" msgstr "новый файл" -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 msgid "Commit Changes" msgstr "Применить изменения" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "Предыдущая ревизия" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "Следующая ревизия" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "Отслеживать данную ветку" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "Загружается список файлов..." -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 msgid "Size" msgstr "Размер" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 msgid "Last Revision" msgstr "Последняя версия" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 msgid "Last Modified" msgstr "Последнее изменение" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 msgid "Last Committer" msgstr "Автор последней ревизии" @@ -5454,7 +5980,7 @@ msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5467,25 +5993,24 @@ msgid "Edit file" msgstr "Редактировать файл" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "Исходный код" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "Редактирование файла" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" @@ -5493,84 +6018,105 @@ msgstr[1] "%s авторов" msgstr[2] "%s автора" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" +#: kallithea/templates/files/files_source.html:34 +#, fuzzy, python-format +#| msgid "Deleted branch: %s" +msgid "Edit on Branch: %s" +msgstr "Удалена ветка: %s" + +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +msgid "Editing files allowed only when on branch head revision" +msgstr "Редактирование файлов разрешено только в HEAD-ревизии данной ветки" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "Редактирование файлов разрешено только в HEAD-ревизии данной ветки" - -#: kallithea/templates/files/files_source.html:45 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "Бинарный файл (%s)" -#: kallithea/templates/files/files_source.html:74 +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 msgid "File is too big to display." msgstr "Файл слишком большой для отображения." -#: kallithea/templates/files/files_source.html:76 +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 msgid "Show full annotation anyway." msgstr "Показать полный diff." -#: kallithea/templates/files/files_source.html:78 +#: kallithea/templates/files/files_source.html:73 +#: kallithea/tests/data/templates/files/files_source.html.py:133 msgid "Show as raw." msgstr "Показать только текст." #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "аннотация" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "По заданному пути файлы отсутствуют" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "%s Наблюдатели" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "Наблюдатели" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "Наблюдать за репозиторием" @@ -5579,72 +6125,82 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "Имя форка" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" "Ревизия по умолчанию, из которой будет производиться выгрузка файлов при " "скачивании." -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "Приватный" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "Скопировать привилегии" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "Скопировать привилегии с форкнутого репозитория" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "Обновлять после клонирования" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "Скачивать исходники после создания клона" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "Форки %s" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "Ответвления" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "Форкнуто" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "Форки ещё не созданы" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 msgid "ATOM journal feed" msgstr "Лента журнала ATOM" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "Лента журнала RSS" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "Мои репозитории" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "Записи отсуствуют" @@ -5658,34 +6214,45 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 msgid "New Pull Request" msgstr "Новый pull-запрос" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "Заголовок" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "Написать короткое писание по этому запросу" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "Поток изменений" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "Первоначальный репозиторий" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "Репозиторий назначения" @@ -5721,7 +6288,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "Закрыто" @@ -5739,34 +6308,42 @@ msgstr "Подтвердите удаление этого pull-request'а" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, fuzzy, python-format msgid "%s Pull Request %s" msgstr "%s Pull-запрос #%s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, python-format msgid "Pull request %s from %s#%s" msgstr "Pull-запросы %s от %s#%s" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 #, fuzzy msgid "Summarize the changes" msgstr "Применить изменения" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "Еще не рассмотренный" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" @@ -5774,90 +6351,115 @@ msgstr[1] "%d рецензента" msgstr[2] "%d рецензентов" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "Запрос на внесение изменений был рассмотрен всеми рецензентами" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 msgid "There are no reviewers" msgstr "Нет рецензентов" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 #, fuzzy msgid "on" msgstr "ничего" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "Принять изменения" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 #, fuzzy -msgid "Update" -msgstr "[обновлён] пользователь" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#| msgid "Registration" +msgid "Next iteration" +msgstr "Регистрация" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:215 +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 msgid "" -"Pull requests do not change once created. Select a revision and save to " -"replace this pull request with a new one." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:224 +"Pull request iterations do not change content once created. Select a " +"revision and save to make a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +msgid "Save Changes" +msgstr "Сохранить изменения" + +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +msgid "Cancel Changes" +msgstr "Отменить изменения" + +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 msgid "Pull Request Reviewers" msgstr "Рецензенты pull-запросов" -#: kallithea/templates/pullrequests/pullrequest_show.html:249 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 msgid "Remove reviewer" msgstr "Удалить рецензента" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:269 +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 msgid "Potential Reviewers" msgstr "Потенциальные рецензенты" -#: kallithea/templates/pullrequests/pullrequest_show.html:272 +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:295 -msgid "Save Changes" -msgstr "Сохранить изменения" - -#: kallithea/templates/pullrequests/pullrequest_show.html:296 -#, fuzzy -msgid "Save Updates as New Pull Request" -msgstr "Создать новый pull запрос" - -#: kallithea/templates/pullrequests/pullrequest_show.html:297 -msgid "Cancel Changes" -msgstr "Отменить изменения" - -#: kallithea/templates/pullrequests/pullrequest_show.html:307 +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 #, fuzzy msgid "Pull Request Content" msgstr "Статус pull-request'а был изменен" +#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +msgid "Common ancestor" +msgstr "Общий предок" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5873,243 +6475,469 @@ msgid "Pull Requests to '%s'" msgstr "Pull-запросы для %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "Создать новый pull-запрос" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, fuzzy, python-format msgid "Show Pull Requests to %s" msgstr "Pull-запросы для %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, fuzzy, python-format msgid "Show Pull Requests from '%s'" msgstr "Pull запросы от %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 #, fuzzy msgid "Show closed pull requests (in addition to open pull requests)" msgstr "Показать закрытые pull-запросы" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 #, fuzzy msgid "Pull Requests Created by Me" msgstr "Рецензенты запросов на внесение изменений Pull request" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +#, fuzzy +#| msgid "Pull Request Reviewers" +msgid "Pull Requests Needing My Review" +msgstr "Рецензенты pull-запросов" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 #, fuzzy msgid "Pull Requests I Participate In" msgstr "Моё участие" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 msgid "Search in All Repositories" msgstr "Поиск по всем репозиториям" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "Фраза для поиска" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "Критерий поиска" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "Содержимое файлов" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "Сообщения коммитов" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "Имя файла" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "Недостаточно прав" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "ATOM лента репозитория %s" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "RSS лента репозитория %s" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "Включено" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "Полученная статистика: " -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "файлы" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "Показать еще" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 msgid "commits" msgstr "commit'ы" +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "файлы добавлены" + +#: kallithea/templates/summary/statistics.html:390 +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" +msgstr "файлы изменены" + #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "файлы добавлены" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" -msgstr "файлы изменены" +#: kallithea/tests/data/templates/summary/statistics.html.py:153 +msgid "files removed" +msgstr "файлы удалены" #: kallithea/templates/summary/statistics.html:393 -msgid "files removed" -msgstr "файлы удалены" +#: kallithea/tests/data/templates/summary/statistics.html.py:155 +msgid "commit" +msgstr "commit" + +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 +msgid "file added" +msgstr "файл удалён" #: kallithea/templates/summary/statistics.html:395 -msgid "commit" -msgstr "commit" +#: kallithea/tests/data/templates/summary/statistics.html.py:159 +msgid "file changed" +msgstr "файл изменён" #: kallithea/templates/summary/statistics.html:396 -msgid "file added" -msgstr "файл удалён" - -#: kallithea/templates/summary/statistics.html:397 -msgid "file changed" -msgstr "файл изменён" - -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "файл удалён" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "%s общие сведения" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "Репозитарий заблокирован %s" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "Репозиторий разблокирован" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "Форк от" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "Клонировать из" +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 +msgid "Show by ID" +msgstr "Показать по ID" + #: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "Ссылка для клонирования" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/summary/summary.html.py:143 msgid "Show by Name" msgstr "Показать по имени" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "Показать по ID" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "Популярные файлы" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 msgid "Download" msgstr "Скачать" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 msgid "There are no downloads yet" msgstr "Скачиваний ещё нет" +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 +msgid "Downloads are disabled for this repository" +msgstr "Скачивание отключено в этом репозитории" + +#: kallithea/templates/summary/summary.html:108 +#: kallithea/tests/data/templates/summary/summary.html.py:190 +msgid "Download as zip" +msgstr "Скачать в zip" + +#: kallithea/templates/summary/summary.html:112 +#: kallithea/tests/data/templates/summary/summary.html.py:194 +msgid "Check this to download archive with subrepos" +msgstr "Отметьте для скачивания архива с дочерними репозиториями" + #: kallithea/templates/summary/summary.html:114 -msgid "Downloads are disabled for this repository" -msgstr "Скачивание отключено в этом репозитории" - -#: kallithea/templates/summary/summary.html:120 -msgid "Download as zip" -msgstr "Скачать в zip" - -#: kallithea/templates/summary/summary.html:125 -msgid "Check this to download archive with subrepos" -msgstr "Отметьте для скачивания архива с дочерними репозиториями" - -#: kallithea/templates/summary/summary.html:125 +#: kallithea/tests/data/templates/summary/summary.html.py:196 msgid "With subrepos" msgstr "С дочерними репозиториями" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "Размер репозитория" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "Лента новостей" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 msgid "Latest Changes" msgstr "Последние изменения" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 msgid "Quick Start" msgstr "Быстрый старт" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "Скачать %s как %s" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "%s Меток" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "Сравнить теги" +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "Панель управления" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "Имя группы" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "Запомнить" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "Измените аватар через сайт" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "Используется" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "Не указан email. Пожалуйста, обновите ваш email." + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "Опции пересканирования" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "Веб" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "Запрашивать SSL для операций с VCS" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "" +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." +"\n" +" The following " +"variables are available:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "Элементы панели" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "" +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "фильтр..." + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "Забыли пароль?" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "Предок" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "Комментарий от %s к набору изменений %s %s" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "Состояние набора изменений изменено на" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "%s упомянул Вас в комментарии к pull-запросу %s \"%s\"" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "%s запросил рецензирование pull-запроса %s \"%s\"" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +msgid "The comment closed the pull request with status" +msgstr "Комментарий закрыл pull-запрос со статусом" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +msgid "The comment was made with status" +msgstr "Комментарий оставлен со статусом" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "Подробнее о пользователе" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" +msgstr "Размер репозитория" #~ msgid "No comments." #~ msgstr "Нет комментариев." @@ -6120,9 +6948,6 @@ #~ msgid "journal" #~ msgstr "журнал" -#~ msgid "unmodified" -#~ msgstr "" - #~ msgid "Locked repository" #~ msgstr "Закрытый репозиторий" @@ -6144,11 +6969,6 @@ #~ msgid "No Files" #~ msgstr "Файлов нет" -#~ msgid "" -#~ "_: \n" -#~ "" -#~ msgstr "" - #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "Имя \"%(username)s\" отклонено" @@ -6161,12 +6981,6 @@ #~ msgid "invalid clone URL" #~ msgstr "неверный URL для клонирования" -#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" -#~ msgstr "" - -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" -#~ msgstr "" - #~ msgid "Defaults" #~ msgstr "Значения по умолчанию" @@ -6179,24 +6993,6 @@ #~ msgid "My Permissions" #~ msgstr "Мои привилегии" -#~ msgid "expires" -#~ msgstr "" - -#~ msgid "reset" -#~ msgstr "" - -#~ msgid "expired" -#~ msgstr "" - -#~ msgid "remove" -#~ msgstr "" - -#~ msgid "No additional api keys specified" -#~ msgstr "" - -#~ msgid "New api key" -#~ msgstr "" - #~ msgid "delete" #~ msgstr "удалить" @@ -6227,15 +7023,6 @@ #~ msgid "admin" #~ msgstr "администратор" -#~ msgid "user/user group" -#~ msgstr "" - -#~ msgid "delegated admin" -#~ msgstr "" - -#~ msgid "Import existing repository ?" -#~ msgstr "" - #~ msgid "Optional URL from which repository should be cloned." #~ msgstr "Опциональный URL, с которого требуется склонировать репозиторий." @@ -6245,93 +7032,21 @@ #~ msgid "Pull Changes from Remote Location" #~ msgstr "Получить изменения с удалённой стороны" -#~ msgid "This repository does not have a remote URL set." -#~ msgstr "" - #~ msgid "Non-changeable id" #~ msgstr "Неизменяемый id" #~ msgid "edit" #~ msgstr "редактировать" -#~ msgid "new value" -#~ msgstr "" - -#~ msgid "URL used for doing remote pulls." -#~ msgstr "" - -#~ msgid "Email prefix" -#~ msgstr "" - -#~ msgid "Kallithea email from" -#~ msgstr "" - -#~ msgid "Error email from" -#~ msgstr "" - -#~ msgid "Error email recipients" -#~ msgstr "" - -#~ msgid "SMTP server" -#~ msgstr "" - -#~ msgid "SMTP username" -#~ msgstr "" - -#~ msgid "SMTP password" -#~ msgstr "" - -#~ msgid "SMTP port" -#~ msgstr "" - -#~ msgid "SMTP use TLS" -#~ msgstr "" - -#~ msgid "SMTP use SSL" -#~ msgstr "" - -#~ msgid "SMTP auth" -#~ msgstr "" - #~ msgid "Destroy old data" #~ msgstr "Уничтожить все данные" -#~ msgid "check for updates" -#~ msgstr "" - #~ msgid "Default permissions" #~ msgstr "Стандартные привилегии" -#~ msgid "user groups" -#~ msgstr "" - -#~ msgid "Inherit from defaults" -#~ msgstr "" - -#~ msgid "show" -#~ msgstr "" - -#~ msgid "parent rev." -#~ msgstr "" - -#~ msgid "child rev." -#~ msgstr "" - -#~ msgid "no revisions" -#~ msgstr "" - #~ msgid "Status change from pull request" #~ msgstr "Изменение статуса" -#~ msgid "Status change on changeset" -#~ msgstr "" - -#~ msgid "Comment on changeset" -#~ msgstr "" - -#~ msgid "revision" -#~ msgstr "" - #~ msgid "Mimetype" #~ msgstr "Тип файла" @@ -6341,9 +7056,6 @@ #~ msgid "Latest vote: %s" #~ msgstr "Последняя оценка: %s" -#~ msgid "Nobody voted" -#~ msgstr "" - #~ msgid "owner" #~ msgstr "владелец" @@ -6365,8 +7077,262 @@ #~ msgid "You can generate it by clicking following URL" #~ msgstr "Вы можете заново сгенерировать его, перейдя по следующей ссылке" -#~ msgid "Please ignore this email if you did not request a new password ." -#~ msgstr "" - #~ msgid "Created by" #~ msgstr "Создано" + +#~ msgid "Ancestor didn't change - show diff since previous version:" +#~ msgstr "" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "Закрыт, замещён %s ." + +#~ msgid "The following changes are available on %s:" +#~ msgstr "" + +#~ msgid "Closing." +#~ msgstr "Закрыт." + +#~ msgid "Changeset not found" +#~ msgstr "Набор изменений не найден" + +#~ msgid "Repository no access" +#~ msgstr "Репозитарий - нет доступа" + +#~ msgid "Repository read access" +#~ msgstr "Репозитарий - доступ на чтение" + +#~ msgid "Repository write access" +#~ msgstr "Репозитарий - доступ на запись" + +#~ msgid "Repository admin access" +#~ msgstr "Репозитарий - администрирование" + +#~ msgid "Repository Group no access" +#~ msgstr "Группа Репозиториев - нет доступа" + +#~ msgid "Repository Group read access" +#~ msgstr "Группа Репозиториев - доступ на чтение" + +#~ msgid "Repository Group write access" +#~ msgstr "Группа Репозиториев - доступ на запись" + +#~ msgid "Repository Group admin access" +#~ msgstr "Группа Репозиториев - администрирование" + +#~ msgid "Repository creation disabled" +#~ msgstr "Создание репозиториев отключено" + +#~ msgid "Repository creation enabled" +#~ msgstr "Создание репозиториев включено" + +#~ msgid "Repository forking disabled" +#~ msgstr "Возможность создавать форк репозитория отключена" + +#~ msgid "Repository forking enabled" +#~ msgstr "Возможность создавать форк репозитория включена" + +#~ msgid "Register disabled" +#~ msgstr "Регистрация отключена" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "Регистрация нового пользователя в Kallithea с ручной активацией" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "Регистрация нового пользователя в Kallithea с автоматической активацией" + +#~ msgid "Not Reviewed" +#~ msgstr "Не просмотрено" + +#~ msgid "Rejected" +#~ msgstr "Отклонено" + +#~ msgid "Under Review" +#~ msgstr "На рассмотрении" + +#~ msgid "Repository group no access" +#~ msgstr "Группа Репозиториев - нет доступа" + +#~ msgid "Repository group read access" +#~ msgstr "Группа репозиториев - доступ на чтение" + +#~ msgid "Repository group write access" +#~ msgstr "Группа репозиториев - доступ на запись" + +#~ msgid "Repository group admin access" +#~ msgstr "Группа репозиториев - администрирование" + +#~ msgid "User group no access" +#~ msgstr "Группа пользователей - нет доступа" + +#~ msgid "User group read access" +#~ msgstr "Группа пользователей - доступ на чтение" + +#~ msgid "User group write access" +#~ msgstr "Группа пользователей - доступ на запись" + +#~ msgid "User group admin access" +#~ msgstr "Группа пользователей - администрирование" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "Создание групп репозиториев отключено" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "Создание групп репозиториев включено" + +#~ msgid "User Group creation disabled" +#~ msgstr "Создание групп пользователей отключено" + +#~ msgid "User Group creation enabled" +#~ msgstr "Создание групп пользователей включено" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "Регистрация пользователя с ручной активацией учётной записи" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "Регистрация пользователя с автоматической активацией" + +#~ msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "%(user)s просит вас рассмотреть pull request #%(pr_id)s: %(pr_title)s" + +#~ msgid "repositories" +#~ msgstr "репозитории" + +#~ msgid "No repositories found." +#~ msgstr "Репозитарии не найдены." + +#~ msgid "There are no branches yet" +#~ msgstr "Ветки ещё не созданы" + +#~ msgid "There are no tags yet" +#~ msgstr "Метки отсутсвуют" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "Закладок ещё нет" + +#~ msgid "Analytics HTML block" +#~ msgstr "" + +#~ msgid "" +#~ "HTML with JavaScript for web analytics" +#~ " systems like Google Analytics or " +#~ "Piwik. This will be added at the" +#~ " bottom of every page." +#~ msgstr "" + +#~ msgid "" +#~ "Schema of clone URL construction eg. " +#~ "'{scheme}://{user}@{netloc}/{repo}'.\n" +#~ " The " +#~ "following variables are available:\n" +#~ " {scheme}" +#~ " 'http' or 'https' sent from running" +#~ " Kallithea server,\n" +#~ " {user}" +#~ " current user username,\n" +#~ " {netloc}" +#~ " network location/server host of running" +#~ " Kallithea server,\n" +#~ " {repo}" +#~ " full repository name,\n" +#~ " {repoid}" +#~ " ID of repository, can be used " +#~ "to contruct clone-by-id" +#~ msgstr "" + +#~ msgid "enabled" +#~ msgstr "включено" + +#~ msgid "%s Bookmarks" +#~ msgstr "Закладки %s" + +#~ msgid "Compare Bookmarks" +#~ msgstr "" + +#~ msgid "%s Branches" +#~ msgstr "Ветки %s" + +#~ msgid "Compare Branches" +#~ msgstr "" + +#~ msgid "Editing file" +#~ msgstr "Редактирование файла" + +#~ msgid "Update" +#~ msgstr "[обновлён] пользователь" + +#~ msgid "" +#~ "Pull requests do not change once " +#~ "created. Select a revision and save " +#~ "to replace this pull request with " +#~ "a new one." +#~ msgstr "" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "Создать новый pull запрос" + +#~ msgid "%s Tags" +#~ msgstr "%s Меток" + +#~ msgid "Compare Tags" +#~ msgstr "Сравнить теги" + +#~ msgid "" +#~ "Changing status on a changeset " +#~ "associated with a closed pull request" +#~ " is not allowed" +#~ msgstr "" +#~ "Нельзя редактировать статус изменений, " +#~ "связанных с закрытыми pull-request'ами" + +#~ msgid "You have successfully registered into Kallithea" +#~ msgstr "Регистрация в Kallithea прошла успешно" + +#~ msgid "This pull request can be updated with changes on %s:" +#~ msgstr "Этот pull-запрос может быть обновлён из %s:" + +#~ msgid "Confirm to invalidate repository cache." +#~ msgstr "Подтвердите сброс кэша." + +#~ msgid "" +#~ "Changeset status: %s\n" +#~ "Click to open associated pull request %s" +#~ msgstr "" +#~ "Статус набора изенений: %s⏎\n" +#~ "Кликрните, чтобы перейти к соответствующему pull-request'у #%s" + +#~ msgid "Commenting on line {1}." +#~ msgstr "Комментарий к строке {1}." + +#~ msgid "Comments parsed using %s syntax with %s support." +#~ msgstr "" +#~ "Парсинг комментариев выполнен с использованием" +#~ " синтаксиса %s с поддержкой %s." + +#~ msgid "Use @username inside this text to notify another user" +#~ msgstr "" +#~ "Используйте @имя_пользователя в тексте, чтобы" +#~ " отправить оповещение указанному пользователю" + +#~ msgid "Comment preview" +#~ msgstr "Предварительный просмотр комментария" + +#~ msgid "Preview" +#~ msgstr "Предпросмотр" + +#~ msgid "Use @username inside this text to notify another user." +#~ msgstr "" +#~ "Используйте @имя_пользователя в тексте, чтобы" +#~ " отправить оповещение указанному пользователю." + +#~ msgid "New file mode" +#~ msgstr "Режим нового файла" + +#~ msgid "File is too big to display" +#~ msgstr "Файл слишком большой для отображения" + +#~ msgid "Save as New Pull Request" +#~ msgstr "Создать новый pull запрос" + diff -r a48802bf7134 -r 880e2f07651b kallithea/i18n/sk/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Thu Jul 27 03:02:37 2017 +0200 +++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po Thu Jul 27 14:26:14 2017 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2016-03-14 16:51+0100\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: 2015-04-01 12:59+0200\n" "Last-Translator: Andrew Shadura \n" "Language-Team: Slovak " @@ -18,447 +18,480 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: kallithea/controllers/changelog.py:85 -#: kallithea/controllers/pullrequests.py:240 kallithea/lib/base.py:515 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "Zatiaľ nie sú žiadne zmeny" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:198 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "(zatvorené)" -#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "Ukázať medzery" -#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 msgid "Ignore whitespace" msgstr "Ignorovať medzery" -#: kallithea/controllers/changeset.py:168 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:744 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "Taká revízia neexistuje" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "Prázdny repozitár" + +#: kallithea/controllers/compare.py:73 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 #, fuzzy msgid "No response" msgstr "Neznáma revízia %s" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "Nemáte oprávnenie na zobrazenie tejto stránky" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:55 +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 +#: kallithea/templates/changeset/changeset.html:195 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: kallithea/controllers/feed.py:84 +#, python-format +msgid "%s committed on %s" +msgstr "" + +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 +#, python-format +msgid "%s %s feed" +msgstr "" + +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 #, python-format msgid "Changes on %s repository" msgstr "Zmeny na repozitáre %s" -#: kallithea/controllers/feed.py:56 -#, python-format -msgid "%s %s feed" -msgstr "" - -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 -msgid "Changeset was too big and was cut off..." -msgstr "" - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "" - -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:93 msgid "Click here to add new file" msgstr "Kliknite pre pridanie nového súboru" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "Zatiaľ nie sú žiadne súbory. %s" -#: kallithea/controllers/files.py:195 +#: kallithea/controllers/files.py:191 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:307 kallithea/controllers/files.py:367 -#: kallithea/controllers/files.py:434 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" -#: kallithea/controllers/files.py:319 +#: kallithea/controllers/files.py:309 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:330 +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Zmazaný súbor %s cez Kallithea" -#: kallithea/controllers/files.py:352 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "Úspešne zmazaný súbor %s" -#: kallithea/controllers/files.py:356 kallithea/controllers/files.py:422 -#: kallithea/controllers/files.py:503 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "Došlo k chybe pri ukladaní" -#: kallithea/controllers/files.py:379 +#: kallithea/controllers/files.py:369 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:393 +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:409 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "Žiadne zmeny" -#: kallithea/controllers/files.py:418 kallithea/controllers/files.py:492 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:445 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "Pridaný súbor cez Kallithea" -#: kallithea/controllers/files.py:466 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "Žiadny obsah" -#: kallithea/controllers/files.py:470 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "" +#: kallithea/controllers/files.py:517 +msgid "Downloads disabled" +msgstr "Sťahovanie vypnuté" + #: kallithea/controllers/files.py:528 -msgid "Downloads disabled" -msgstr "Sťahovanie vypnuté" - -#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "Neznáma revízia %s" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "Prázdny repozitár" -#: kallithea/controllers/files.py:543 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:773 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "Zmeny" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "Vetvy" -#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "Tagy" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "Skupiny" -#: kallithea/controllers/home.py:94 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:479 -#: kallithea/templates/base/base.html:653 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "Repozitáre" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "Vetva" -#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "" -#: kallithea/controllers/home.py:151 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:157 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "Záložka" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:306 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 #, fuzzy msgid "Bad captcha" msgstr "zlá captcha" -#: kallithea/controllers/login.py:150 +#: kallithea/controllers/login.py:148 +#, python-format msgid "You have successfully registered with %s" msgstr "" -#: kallithea/controllers/login.py:195 +#: kallithea/controllers/login.py:193 msgid "A password reset confirmation code has been sent" msgstr "" -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:242 msgid "Invalid password reset token" msgstr "" -#: kallithea/controllers/login.py:249 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "Úspešne aktualizované heslo" -#: kallithea/controllers/pullrequests.py:123 +#: kallithea/controllers/pullrequests.py:73 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:135 #, python-format msgid "%s (closed)" msgstr "%s (zatvorené)" -#: kallithea/controllers/pullrequests.py:151 +#: kallithea/controllers/pullrequests.py:162 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:183 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:184 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 msgid "Bookmarks" msgstr "Záložky" -#: kallithea/controllers/pullrequests.py:312 +#: kallithea/controllers/pullrequests.py:326 #, python-format msgid "Error creating pull request: %s" msgstr "" +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 +msgid "Error occurred while creating pull request" +msgstr "" + #: kallithea/controllers/pullrequests.py:358 -#: kallithea/controllers/pullrequests.py:505 -msgid "No description" -msgstr "" - -#: kallithea/controllers/pullrequests.py:365 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:368 -#: kallithea/controllers/pullrequests.py:455 -#: kallithea/controllers/pullrequests.py:512 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:371 -#: kallithea/controllers/pullrequests.py:458 -msgid "Error occurred while creating pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:403 -msgid "Missing changesets since the previous pull request:" +#: kallithea/controllers/pullrequests.py:381 +msgid "New pull request iteration created" msgstr "" #: kallithea/controllers/pullrequests.py:410 #, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:417 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:426 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:464 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:472 -msgid "Pull request update created" -msgstr "" - -#: kallithea/controllers/pullrequests.py:516 +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:414 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "" + +#: kallithea/controllers/pullrequests.py:439 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:531 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:491 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:599 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:617 -#, python-format -msgid "The following changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:621 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:629 +#: kallithea/controllers/pullrequests.py:552 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:556 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:635 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:571 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:573 +#, python-format +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:738 +#: kallithea/controllers/pullrequests.py:676 #, fuzzy, python-format msgid "Successfully deleted pull request %s" msgstr "Úspešne zmazaný súbor %s" -#: kallithea/controllers/pullrequests.py:748 -msgid "Closing." -msgstr "" - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "" -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Došlo k chybe počas vyhľadávania." -#: kallithea/controllers/summary.py:181 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:184 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "" @@ -470,149 +503,153 @@ msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 msgid "Forever" msgstr "" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "5 minutes" msgstr "5 minút" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 hour" msgstr "1 hodina" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 msgid "1 day" msgstr "1 deň" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "1 mesiac" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:290 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "Došlo k chybe pri vytváraní gist" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:200 msgid "Unmodified" msgstr "" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "Došlo k chybe pri aktualizácii gist %s" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:201 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "Došlo k chybe pri aktualizácii hesla užívateľa" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "Došlo k chybe pri ukladaní e-mailovej adresy" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:324 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" msgstr "" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -620,610 +657,643 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:336 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:344 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1705 -msgid "Manual activation of external account" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1706 -msgid "Automatic activation of external account" -msgstr "" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:187 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:192 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:249 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "" +#: kallithea/controllers/admin/repo_groups.py:248 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:258 +#, python-format +msgid "This group contains %s repositories and cannot be deleted" +msgstr "" + #: kallithea/controllers/admin/repo_groups.py:265 #, python-format -msgid "Error occurred during update of repository group %s" -msgstr "" - -#: kallithea/controllers/admin/repo_groups.py:283 -#, python-format -msgid "This group contains %s repositories and cannot be deleted" -msgstr "" - -#: kallithea/controllers/admin/repo_groups.py:290 -#, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:296 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:301 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:404 -#: kallithea/controllers/admin/repo_groups.py:439 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:456 -#: kallithea/controllers/admin/repos.py:397 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:151 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:212 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:221 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:224 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:261 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:309 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:312 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:317 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:320 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:325 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:373 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:429 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:443 +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, fuzzy, python-format +#| msgid "Error occurred during gist creation" +msgid "An error occurred during creation of field: %r" +msgstr "Došlo k chybe pri vytváraní gist" + +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:459 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:490 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:511 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "Nič" -#: kallithea/controllers/admin/repos.py:513 +#: kallithea/controllers/admin/repos.py:473 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:480 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:536 -#: kallithea/controllers/admin/repos.py:563 +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 #, fuzzy msgid "Repository has been locked" msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" -#: kallithea/controllers/admin/repos.py:539 -#: kallithea/controllers/admin/repos.py:560 +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 #, fuzzy msgid "Repository has been unlocked" msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" -#: kallithea/controllers/admin/repos.py:542 -#: kallithea/controllers/admin/repos.py:567 +#: kallithea/controllers/admin/repos.py:502 +#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:533 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:585 +#: kallithea/controllers/admin/repos.py:537 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:603 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:636 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:151 -#: kallithea/controllers/admin/settings.py:248 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:187 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:244 +#: kallithea/controllers/admin/settings.py:189 +#, fuzzy, python-format +#| msgid "Watched Repositories" +msgid "Invalidated %s repositories" +msgstr "Repozitáre" + +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:301 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:306 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:347 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:378 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:392 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:396 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:208 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:219 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:224 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:242 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:217 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:222 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:235 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:462 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:468 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:482 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:737 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:750 +#: kallithea/lib/auth.py:829 +msgid "You need to be a registered user to perform this action" +msgstr "" + +#: kallithea/lib/auth.py:857 +msgid "You need to be signed in to view this page" +msgstr "" + +#: kallithea/lib/base.py:449 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:768 +#: kallithea/lib/base.py:508 msgid "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/auth.py:813 -msgid "You need to be a registered user to perform this action" -msgstr "" - -#: kallithea/lib/auth.py:843 -msgid "You need to be signed in to view this page" -msgstr "" - -#: kallithea/lib/base.py:493 +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:623 -msgid "Changeset not found" -msgstr "" - -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/base.py:617 +#, python-format +msgid "Changeset for %s %s not found in %s" +msgstr "" + +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:613 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "Changeset %s not found" +msgstr "Zmeny" + +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1128 -#: kallithea/templates/compare/compare_diff.html:71 -#: kallithea/templates/pullrequests/pullrequest_show.html:337 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1469 +#: kallithea/lib/helpers.py:1230 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1231,7 +1301,7 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1239,7 +1309,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:435 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1247,7 +1317,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1255,7 +1325,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:437 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1263,7 +1333,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1271,7 +1341,7 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:439 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1279,1262 +1349,920 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:455 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:457 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:459 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:462 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:465 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1669 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2237 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2238 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1518 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1701 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1695 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1696 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1715 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1717 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 +#: kallithea/model/db.py:1718 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1719 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1720 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1722 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 +#: kallithea/model/db.py:1723 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1724 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1725 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1727 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1728 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1729 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1730 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1732 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1733 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1735 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1736 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1692 +#: kallithea/model/db.py:1738 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1693 +#: kallithea/model/db.py:1739 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1741 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1742 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1744 #, fuzzy msgid "Only admins can fork repositories" msgstr "Repozitáre" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1745 #, fuzzy msgid "Non-admins can fork repositories" msgstr "Repozitáre" -#: kallithea/model/db.py:1702 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1748 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1749 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2236 +#: kallithea/model/db.py:2276 #, fuzzy msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2239 +#: kallithea/model/db.py:2277 #, fuzzy msgid "Under review" msgstr "" -#: kallithea/model/forms.py:57 -msgid "Please enter a login" +#: kallithea/model/db.py:2278 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2279 +msgid "Approved" msgstr "" #: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 -msgid "Please enter a password" -msgstr "" - #: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:165 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "" +#: kallithea/model/notification.py:240 +#, python-format +msgid "%(user)s commented on changeset %(age)s" +msgstr "" + +#: kallithea/model/notification.py:241 +#, python-format +msgid "%(user)s sent message %(age)s" +msgstr "" + +#: kallithea/model/notification.py:242 +#, python-format +msgid "%(user)s mentioned you %(age)s" +msgstr "" + +#: kallithea/model/notification.py:243 +#, python-format +msgid "%(user)s registered in Kallithea %(age)s" +msgstr "" + +#: kallithea/model/notification.py:244 +#, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:245 +#, python-format +msgid "%(user)s commented on pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:252 +#, python-format +msgid "%(user)s commented on changeset at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:253 +#, python-format +msgid "%(user)s sent message at %(when)s" +msgstr "" + #: kallithea/model/notification.py:254 #, python-format -msgid "%(user)s commented on changeset %(age)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:255 #, python-format -msgid "%(user)s sent message %(age)s" +msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" #: kallithea/model/notification.py:256 #, python-format -msgid "%(user)s mentioned you %(age)s" +msgid "%(user)s opened new pull request at %(when)s" msgstr "" #: kallithea/model/notification.py:257 #, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:266 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:302 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:288 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" + +#: kallithea/model/notification.py:291 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:293 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:307 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:321 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:708 +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" " owners or remove those repository groups: %s" msgstr "" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:368 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:418 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:419 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:96 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:98 +#: kallithea/model/validators.py:75 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:100 +#: kallithea/model/validators.py:77 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" msgstr "" -#: kallithea/model/validators.py:127 +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:111 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + +#: kallithea/model/validators.py:131 +msgid "Invalid user group name" +msgstr "" + +#: kallithea/model/validators.py:132 +#, python-format +msgid "User group \"%(usergroup)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:134 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:154 -msgid "Invalid user group name" -msgstr "" - -#: kallithea/model/validators.py:155 -#, python-format -msgid "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:157 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:197 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:198 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:200 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:258 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:273 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:289 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:304 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "" -#: kallithea/model/validators.py:335 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "" -#: kallithea/model/validators.py:351 +#: kallithea/model/validators.py:326 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:353 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:354 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:356 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:470 +#: kallithea/model/validators.py:449 #, fuzzy msgid "Invalid repository URL" msgstr "Odblokovať repozitár" -#: kallithea/model/validators.py:471 +#: kallithea/model/validators.py:450 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:496 +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:511 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:513 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:563 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:604 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:697 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:714 +#: kallithea/model/validators.py:692 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:712 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:771 +#: kallithea/model/validators.py:749 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -#: kallithea/model/validators.py:783 +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:784 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:831 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:847 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +#, fuzzy +#| msgid "Repository URL" +msgid "Repository Group" +msgstr "Repozitáre" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:132 +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:244 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:414 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 #, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 msgid "Reset Your Password" msgstr "" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 msgid "Send Password Reset Email" msgstr "" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 msgid "New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 msgid "Confirm New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 msgid "Admin Journal" msgstr "" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2543,149 +2271,177 @@ msgstr[2] "%s záznamov" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 #, fuzzy msgid "Repository Defaults" msgstr "Repozitáre" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "" +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 -msgid "Private repository" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 -msgid "" -"Private repositories are only visible to people explicitly added as " -"collaborators." +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 +msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 +msgid "Enable download menu on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 +msgid "Enable locking" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:61 #: kallithea/templates/admin/repos/repo_edit_settings.html:84 -msgid "Enable statistics" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 -msgid "Enable statistics window on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 -msgid "Enable downloads" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 -msgid "Enable download menu on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 -msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2694,318 +2450,471 @@ msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 msgid "Never" msgstr "" +#: kallithea/templates/admin/gists/edit.html:145 +msgid "Update Gist" +msgstr "" + #: kallithea/templates/admin/gists/edit.html:146 -msgid "Update Gist" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:147 -#: kallithea/templates/changeset/changeset_file_comment.html:105 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, python-format msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, python-format msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:31 -#: kallithea/templates/changeset/changeset_file_comment.html:95 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:431 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 #, fuzzy msgid "Owned Repositories" msgstr "Repozitáre" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 #, fuzzy msgid "Watched Repositories" msgstr "Repozitáre" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 msgid "Show Permissions" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, python-format msgid "Confirm to reset this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, python-format msgid "Confirm to remove this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 msgid "Remove" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "" @@ -3013,280 +2922,360 @@ msgid "Change Your Account Password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 msgid "Repositories You Own" msgstr "Vaše repozitáre" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 msgid "Repositories You are Watching" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 msgid "Mark All Read" msgstr "" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +msgid "Mark as read" +msgstr "" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 msgid "Show Notification" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:430 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 msgid "Default Permissions" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 #, fuzzy msgid "Apply to all existing repositories" msgstr "Repozitáre" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 msgid "Permissions for the Default user on new repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 msgid "Repository group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 msgid "Apply to all existing repository groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 +msgid "Permissions for the Default user on new user groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 +msgid "Top level repository creation" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:55 -msgid "Permissions for the Default user on new user groups." +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 +msgid "Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 +msgid "" +"Note: This will also give all users API access to create repositories " +"everywhere. That might change in future versions." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:60 -msgid "Top level repository creation" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, fuzzy, python-format msgid "Confirm to delete this IP address: %s" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "" @@ -3295,31 +3284,42 @@ msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "" @@ -3343,12 +3343,14 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3360,16 +3362,34 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "No response" +msgid "Add repos" +msgstr "Neznáma revízia %s" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3377,103 +3397,115 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 #, fuzzy msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" +#, fuzzy, python-format +#| msgid "Repository Defaults" +msgid "Repository group %s" +msgstr "Repozitáre" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 msgid "Repository Groups Administration" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 #, fuzzy msgid "Clone remote repository" msgstr "Prázdny repozitár" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3502,91 +3534,112 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, fuzzy, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 msgid "Parent" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 msgid "Public Journal Visibility" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 msgid "Add to Public Journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 msgid "Change Locking" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 +msgid "Unlock Repository" +msgstr "Odblokovať repozitár" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 -msgid "Unlock Repository" -msgstr "Odblokovať repozitár" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 #, python-format msgid "Locked by %s on %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 msgid "Confirm to lock repository." msgstr "Potvrdenie blokovania repozitára." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 msgid "Lock Repository" msgstr "Zablokovať repozitár" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3594,17 +3647,21 @@ "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 msgid "Delete this Repository" msgstr "Vymazať tento repozitár" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 #, fuzzy, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" @@ -3612,15 +3669,18 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3631,106 +3691,116 @@ msgid "Invalidate Repository Cache" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "Prázdny repozitár" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "Go to tip of repository" +msgid "Fork of repository" +msgstr "Prázdny repozitár" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "Prázdny repozitár" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 #, fuzzy msgid "Pull Changes from Remote Repository" msgstr "Zmeny na repozitáre %s" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 #, fuzzy msgid "Confirm to pull changes from remote repository." msgstr "Potvrdenie blokovania repozitára." -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 #, fuzzy msgid "Permanent Repository ID" msgstr "Prázdny repozitár" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3740,35 +3810,35 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "Prázdny repozitár" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 #, fuzzy msgid "Repository URL" msgstr "Repozitáre" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3781,313 +3851,372 @@ msgstr "" #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 msgid "Repositories Administration" msgstr "" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 msgid "Settings Administration" msgstr "" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems like Google" +" Analytics or Piwik, but also to perform " +"instance-specific customizations like adding a " +"project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 msgid "Save Settings" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 msgid "" "Check this option to remove all comments, pull requests and other records" " related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 +msgid "Install Git hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 +#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " "not seem to come from Kallithea. WARNING: This operation will destroy any" " custom git hooks you may have deployed by hand!" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/templates/admin/settings/settings_mapping.html:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 msgid "Mercurial extensions" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 +msgid "Enable hgsubversion extension" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:47 -msgid "Enable largefiles extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:51 -msgid "Enable hgsubversion extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 #, fuzzy msgid "Location of repositories" msgstr "Repozitáre" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting" " take effect." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4104,101 +4233,125 @@ "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." "\n" -" The following " +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user" +" username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repositories" +msgid "Repository page size" +msgstr "Repozitáre" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 msgid "Show Members" msgstr "" @@ -4208,13 +4361,15 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4223,48 +4378,59 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 msgid "User Groups Administration" msgstr "" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "" @@ -4274,12 +4440,14 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "" @@ -4288,7 +4456,8 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4297,402 +4466,453 @@ msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 msgid "Users Administration" msgstr "" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:142 -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:147 +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:154 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:331 +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:155 +#: kallithea/tests/data/templates/base/base.html.py:399 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:157 +#: kallithea/tests/data/templates/base/base.html.py:405 msgid "Lock" msgstr "" +#: kallithea/templates/base/base.html:165 +#: kallithea/tests/data/templates/base/base.html.py:413 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 +msgid "Fork" +msgstr "" + #: kallithea/templates/base/base.html:170 -msgid "Follow" -msgstr "" - -#: kallithea/templates/base/base.html:171 -msgid "Unfollow" -msgstr "" - -#: kallithea/templates/base/base.html:174 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 +msgid "Create Pull Request" msgstr "" #: kallithea/templates/base/base.html:175 -#: kallithea/templates/pullrequests/pullrequest.html:88 -msgid "Create Pull Request" -msgstr "" - -#: kallithea/templates/base/base.html:180 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:485 +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:305 +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "" +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 +msgid "Gists" +msgstr "" + #: kallithea/templates/base/base.html:311 -#: kallithea/templates/base/base.html:312 -msgid "Public journal" -msgstr "" - -#: kallithea/templates/base/base.html:317 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:318 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:322 +#: kallithea/tests/data/templates/base/base.html.py:525 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:330 +#: kallithea/templates/base/base.html:319 +#: kallithea/tests/data/templates/base/base.html.py:540 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:353 -#: kallithea/templates/base/base.html:354 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:377 +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:384 +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 msgid "Login to Your Account" msgstr "" +#: kallithea/templates/base/base.html:385 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:389 +msgid "Don't have an account?" +msgstr "" + #: kallithea/templates/base/base.html:407 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:434 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:615 -msgid "Keyboard shortcuts" -msgstr "" - -#: kallithea/templates/base/base.html:624 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 #, fuzzy msgid "Inherit defaults" msgstr "Repozitáre" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -#, fuzzy -msgid "Add Another Comment" -msgstr "" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - #: kallithea/templates/base/root.html:25 -msgid "Group" +#: kallithea/tests/data/templates/base/root.html.py:85 +#, fuzzy +msgid "Add Another Comment" msgstr "" #: kallithea/templates/base/root.html:26 -msgid "members" +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:27 -msgid "Loading ..." +#: kallithea/tests/data/templates/base/root.html.py:89 +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:28 -msgid "loading ..." +#: kallithea/tests/data/templates/base/root.html.py:91 +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/tests/data/templates/base/root.html.py:93 +msgid "members" msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" +#: kallithea/tests/data/templates/base/root.html.py:95 +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:31 -#, fuzzy -msgid "Open New Pull Request from {0}" -msgstr "Zmena stavu" +#: kallithea/tests/data/templates/base/root.html.py:97 +msgid "loading ..." +msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" +#: kallithea/tests/data/templates/base/root.html.py:99 +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets {0} → {1}" +#: kallithea/tests/data/templates/base/root.html.py:101 +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" -msgstr "" +#: kallithea/tests/data/templates/base/root.html.py:103 +#, fuzzy +msgid "Open New Pull Request from {0}" +msgstr "Zmena stavu" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -#: kallithea/templates/changeset/diff_block.html:21 -msgid "Collapse Diff" +#: kallithea/tests/data/templates/base/root.html.py:105 +msgid "Open New Pull Request for {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:36 -msgid "Expand Diff" +#: kallithea/tests/data/templates/base/root.html.py:107 +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" +#: kallithea/tests/data/templates/base/root.html.py:109 +msgid "Selection Link" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 +msgid "Collapse Diff" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" +#: kallithea/tests/data/templates/base/root.html.py:113 +msgid "Expand Diff" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/base/root.html.py:115 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 msgid "Specify changeset" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." msgstr "" #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" @@ -4700,206 +4920,286 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 #, 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 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 #, python-format msgid "" "Changeset status: %s by %s\n" "Click to open associated pull request %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/changelog/changelog_summary_data.html:24 +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 #, fuzzy, python-format -#| msgid "Set changeset status" msgid "Changeset status: %s by %s" msgstr "Zmeny" +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 +msgid "Expand commit message" +msgstr "" + #: kallithea/templates/changelog/changelog.html:116 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:125 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:57 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:141 -#: kallithea/templates/changelog/changelog_summary_data.html:63 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#: kallithea/templates/compare/compare_cs.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:203 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:146 -#: kallithea/templates/changelog/changelog_summary_data.html:68 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:311 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:47 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:87 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:93 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 #, fuzzy msgid "Push new repository" msgstr "Prázdny repozitár" -#: kallithea/templates/changelog/changelog_summary_data.html:101 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:39 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:75 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 msgid "Merge" msgstr "" +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 +msgid "Grafted from:" +msgstr "" + #: kallithea/templates/changeset/changeset.html:123 -msgid "Grafted from:" +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 +msgid "Transplanted from:" msgstr "" #: kallithea/templates/changeset/changeset.html:129 -msgid "Transplanted from:" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:329 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4907,9 +5207,12 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:62 -#: kallithea/templates/pullrequests/pullrequest_show.html:331 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4917,98 +5220,124 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:231 -#: kallithea/templates/changeset/changeset.html:268 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 #, fuzzy msgid "No revisions" msgstr "Neznáma revízia %s" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 #, fuzzy msgid "on pull request" msgstr "Zmena stavu" -#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 msgid "No title" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 #, fuzzy msgid "on this changeset" msgstr "%s zmien" -#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 #, fuzzy msgid "Delete comment?" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 #, fuzzy msgid "Status change" msgstr "Posledné zmeny" -#: kallithea/templates/changeset/changeset_file_comment.html:59 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 msgid "Commenting on line." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:60 +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 msgid "" "Comments are in plain text. Use @username inside this text to notify " "another user." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 #, fuzzy msgid "Set changeset status" msgstr "Zmeny" -#: kallithea/templates/changeset/changeset_file_comment.html:69 +#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:75 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 #, fuzzy msgid "No change" msgstr "Žiadne zmeny" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 #, fuzzy msgid "Finish pull request" msgstr "Zmena stavu" -#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 #, fuzzy msgid "Close" msgstr "(zatvorené)" -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 msgid "Submitting ..." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:104 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:116 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -5016,7 +5345,8 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:129 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, fuzzy, python-format msgid "%d inline" msgid_plural "%d inline" @@ -5024,7 +5354,8 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:130 +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 #, python-format msgid "%d general" msgid_plural "%d general" @@ -5033,108 +5364,160 @@ msgstr[2] "" #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +msgid "Modified" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 msgid "Deleted" msgstr "" -#: kallithea/templates/changeset/diff_block.html:57 +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 msgid "Renamed" msgstr "" -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Neznáma revízia %s" + +#: kallithea/templates/changeset/diff_block.html:52 +msgid "No file after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:69 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:83 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "" #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:85 +#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:321 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:99 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:107 +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:108 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, fuzzy, python-format msgid "%s changesets" msgstr "%s zmien" -#: kallithea/templates/compare/compare_cs.html:109 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 msgid "behind" msgstr "" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "" #: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "" #: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5142,113 +5525,179 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "Comment on Changeset \"%s\"" +msgstr "Zmeny" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changesets" +msgid "Changeset on" +msgstr "Zmeny" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Vetva" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Posledné zmeny" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "Repository has been locked" +msgid "The pull request has been closed." +msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 msgid "We have received a request to reset the password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:8 +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 msgid "" "This account is however managed outside this system and the password " "cannot be changed here." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:13 +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "on pull request" +msgid "Pull request from" +msgstr "Zmena stavu" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +msgid "at" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "on pull request" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "Zmena stavu" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" msgstr "" #: kallithea/templates/files/diff_2way.html:15 @@ -5267,83 +5716,105 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 +#: kallithea/tests/data/templates/files/files_add.html.py:241 msgid "New file type" msgstr "" -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 #, fuzzy msgid "Commit Changes" msgstr "Žiadne zmeny" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 -msgid "Size" -msgstr "" - -#: kallithea/templates/files/files_browser.html:62 -msgid "Last Revision" -msgstr "" - #: kallithea/templates/files/files_browser.html:63 -msgid "Last Modified" +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 +msgid "Size" msgstr "" #: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 +msgid "Last Revision" +msgstr "" + +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 +msgid "Last Modified" +msgstr "" + +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 msgid "Last Committer" msgstr "" @@ -5353,7 +5824,7 @@ msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5366,25 +5837,24 @@ msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" @@ -5392,84 +5862,104 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "" -#: kallithea/templates/files/files_source.html:74 +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 msgid "File is too big to display." msgstr "" -#: kallithea/templates/files/files_source.html:76 +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 msgid "Show full annotation anyway." msgstr "" -#: kallithea/templates/files/files_source.html:78 +#: kallithea/templates/files/files_source.html:73 +#: kallithea/tests/data/templates/files/files_source.html.py:133 msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "" @@ -5478,70 +5968,80 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 -msgid "ATOM journal feed" -msgstr "" - #: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "" @@ -5555,34 +6055,45 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "" @@ -5617,7 +6128,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "" @@ -5635,33 +6148,41 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, python-format msgid "%s Pull Request %s" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, python-format msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" @@ -5669,87 +6190,112 @@ msgstr[1] "" msgstr[2] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 #, fuzzy msgid "There are no reviewers" msgstr "Zatiaľ nie sú reviewers" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 msgid "on" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:215 +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 msgid "" -"Pull requests do not change once created. Select a revision and save to " -"replace this pull request with a new one." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:224 +"Pull request iterations do not change content once created. Select a " +"revision and save to make a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +msgid "Cancel Changes" +msgstr "Zrušiť zmeny" + +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 msgid "Pull Request Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:249 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 #, fuzzy msgid "Remove reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:269 +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 #, fuzzy msgid "Potential Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:272 +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:295 -msgid "Save Changes" +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 +msgid "Pull Request Content" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:296 -msgid "Save Updates as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:297 -msgid "Cancel Changes" -msgstr "Zrušiť zmeny" - -#: kallithea/templates/pullrequests/pullrequest_show.html:307 -msgid "Pull Request Content" +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +msgid "Common ancestor" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 @@ -5767,239 +6313,463 @@ msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 msgid "Search in All Repositories" msgstr "" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "" +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "" + #: kallithea/templates/summary/statistics.html:390 -msgid "commits" +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" msgstr "" #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" +#: kallithea/tests/data/templates/summary/statistics.html.py:153 +msgid "files removed" msgstr "" #: kallithea/templates/summary/statistics.html:393 -msgid "files removed" +#: kallithea/tests/data/templates/summary/statistics.html.py:155 +msgid "commit" +msgstr "" + +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 +msgid "file added" msgstr "" #: kallithea/templates/summary/statistics.html:395 -msgid "commit" +#: kallithea/tests/data/templates/summary/statistics.html.py:159 +msgid "file changed" msgstr "" #: kallithea/templates/summary/statistics.html:396 -msgid "file added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:397 -msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "" +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 +msgid "Show by ID" +msgstr "" + #: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/summary/summary.html.py:143 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "" +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 +msgid "Download" +msgstr "" + +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 +msgid "Downloads are disabled for this repository" +msgstr "" + #: kallithea/templates/summary/summary.html:108 -msgid "Download" +#: kallithea/tests/data/templates/summary/summary.html.py:190 +msgid "Download as zip" msgstr "" #: kallithea/templates/summary/summary.html:112 -msgid "There are no downloads yet" +#: kallithea/tests/data/templates/summary/summary.html.py:194 +msgid "Check this to download archive with subrepos" msgstr "" #: kallithea/templates/summary/summary.html:114 -msgid "Downloads are disabled for this repository" -msgstr "" - -#: kallithea/templates/summary/summary.html:120 -msgid "Download as zip" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 -msgid "Check this to download archive with subrepos" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 +#: kallithea/tests/data/templates/summary/summary.html.py:196 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 msgid "Latest Changes" msgstr "Posledné zmeny" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "" +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." +"\n" +" The following " +"variables are available:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "" +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +msgid "The comment was made with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" msgstr "" #~ msgid "increase diff context to %(num)s lines" @@ -6053,9 +6823,6 @@ #~ msgid "No Files" #~ msgstr "" -#~ msgid "" -#~ msgstr "" - #~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" #~ msgstr "" @@ -6398,8 +7165,235 @@ #~ msgid "Pull Requests from %s'" #~ msgstr "" +#~ msgid "Missing changesets since the previous pull request:" +#~ msgstr "" + +#~ msgid "New changesets on %s %s since the previous pull request:" +#~ msgstr "" + +#~ msgid "Ancestor didn't change - show diff since previous version:" +#~ msgstr "" + #~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request %s" -#~ msgstr "" - +#~ "This pull request is based on " +#~ "another %s revision and there is " +#~ "no simple diff." +#~ msgstr "" + +#~ msgid "No changes found on %s %s since previous version." +#~ msgstr "" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "" + +#~ msgid "Pull request update created" +#~ msgstr "" + +#~ msgid "The following changes are available on %s:" +#~ msgstr "" + +#~ msgid "No changesets found for updating this pull request." +#~ msgstr "" + +#~ msgid "Git pull requests don't support updates yet." +#~ msgstr "" + +#~ msgid "Closing." +#~ msgstr "" + +#~ msgid "An error occurred during creation of field" +#~ msgstr "" + +#~ msgid "Changeset not found" +#~ msgstr "" + +#~ msgid "Repository no access" +#~ msgstr "" + +#~ msgid "Repository read access" +#~ msgstr "" + +#~ msgid "Repository write access" +#~ msgstr "" + +#~ msgid "Repository admin access" +#~ msgstr "" + +#~ msgid "Repository Group no access" +#~ msgstr "" + +#~ msgid "Repository Group read access" +#~ msgstr "" + +#~ msgid "Repository Group write access" +#~ msgstr "" + +#~ msgid "Repository Group admin access" +#~ msgstr "" + +#~ msgid "Repository creation disabled" +#~ msgstr "" + +#~ msgid "Repository creation enabled" +#~ msgstr "" + +#~ msgid "Repository forking disabled" +#~ msgstr "" + +#~ msgid "Repository forking enabled" +#~ msgstr "" + +#~ msgid "Register disabled" +#~ msgstr "" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "" + +#~ msgid "Not Reviewed" +#~ msgstr "" + +#~ msgid "Rejected" +#~ msgstr "" + +#~ msgid "Under Review" +#~ msgstr "" + +#~ msgid "Repository group no access" +#~ msgstr "" + +#~ msgid "Repository group read access" +#~ msgstr "" + +#~ msgid "Repository group write access" +#~ msgstr "" + +#~ msgid "Repository group admin access" +#~ msgstr "" + +#~ msgid "User group no access" +#~ msgstr "" + +#~ msgid "User group read access" +#~ msgstr "" + +#~ msgid "User group write access" +#~ msgstr "" + +#~ msgid "User group admin access" +#~ msgstr "" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "" + +#~ msgid "User Group creation disabled" +#~ msgstr "" + +#~ msgid "User Group creation enabled" +#~ msgstr "" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "" + +#~ msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "repositories" +#~ msgstr "" + +#~ msgid "No repositories found." +#~ msgstr "" + +#~ msgid "There are no branches yet" +#~ msgstr "" + +#~ msgid "There are no tags yet" +#~ msgstr "" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "" + +#~ msgid "Analytics HTML block" +#~ msgstr "" + +#~ msgid "" +#~ "HTML with JavaScript for web analytics" +#~ " systems like Google Analytics or " +#~ "Piwik. This will be added at the" +#~ " bottom of every page." +#~ msgstr "" + +#~ msgid "" +#~ "Schema of clone URL construction eg. " +#~ "'{scheme}://{user}@{netloc}/{repo}'.\n" +#~ " The " +#~ "following variables are available:\n" +#~ " {scheme}" +#~ " 'http' or 'https' sent from running" +#~ " Kallithea server,\n" +#~ " {user}" +#~ " current user username,\n" +#~ " {netloc}" +#~ " network location/server host of running" +#~ " Kallithea server,\n" +#~ " {repo}" +#~ " full repository name,\n" +#~ " {repoid}" +#~ " ID of repository, can be used " +#~ "to contruct clone-by-id" +#~ msgstr "" + +#~ msgid "enabled" +#~ msgstr "" + +#~ msgid "disabled" +#~ msgstr "" + +#~ msgid "%s Bookmarks" +#~ msgstr "" + +#~ msgid "Compare Bookmarks" +#~ msgstr "" + +#~ msgid "%s Branches" +#~ msgstr "" + +#~ msgid "Compare Branches" +#~ msgstr "" + +#~ msgid "Editing file" +#~ msgstr "" + +#~ msgid "Update" +#~ msgstr "" + +#~ msgid "" +#~ "Pull requests do not change once " +#~ "created. Select a revision and save " +#~ "to replace this pull request with " +#~ "a new one." +#~ msgstr "" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "" + +#~ msgid "%s Tags" +#~ msgstr "" + +#~ msgid "Compare Tags" +#~ msgstr "" + diff -r a48802bf7134 -r 880e2f07651b kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Thu Jul 27 03:02:37 2017 +0200 +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Thu Jul 27 14:26:14 2017 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2016-03-14 16:51+0100\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: 2016-03-24 15:03+0000\n" "Last-Translator: YFdyh000 \n" "Language-Team: Chinese (China) " @@ -22,445 +22,485 @@ "X-Generator: Weblate 2.6-dev\n" "Generated-By: Babel 1.3\n" -#: kallithea/controllers/changelog.py:85 -#: kallithea/controllers/pullrequests.py:240 kallithea/lib/base.py:515 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "还没有修订集" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "无" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:198 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "(已关闭)" -#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "显示空白" -#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 msgid "Ignore whitespace" msgstr "忽略空白" -#: kallithea/controllers/changeset.py:168 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "增加差异上下文到 %(num)s 行" -#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:744 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "选择修订集" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "确认锁定版本库" + +#: kallithea/controllers/compare.py:73 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 msgid "No response" msgstr "无响应" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "未知错误" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "由于错误的语法，服务器无法对请求进行响应。" -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "未授权的资源访问" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "无权访问该页面" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "资源未找到" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "服务进入非预期的混乱状态，这会阻止它对请求进行响应。" -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "%s库的修改" - -#: kallithea/controllers/feed.py:56 +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 +#: kallithea/templates/changeset/changeset.html:195 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 +msgid "Changeset was too big and was cut off..." +msgstr "修订集太大并已被截断..." + +#: kallithea/controllers/feed.py:84 +#, python-format +msgid "%s committed on %s" +msgstr "" + +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 #, python-format msgid "%s %s feed" msgstr "%s %s订阅" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 -msgid "Changeset was too big and was cut off..." -msgstr "修订集太大并已被截断..." - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "" - -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 +#, python-format +msgid "Changes on %s repository" +msgstr "%s库的修改" + +#: kallithea/controllers/files.py:93 msgid "Click here to add new file" msgstr "点击这里添加新文件" -#: kallithea/controllers/files.py:93 +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "这里还没有文件。%s" -#: kallithea/controllers/files.py:195 +#: kallithea/controllers/files.py:191 #, python-format msgid "%s at %s" msgstr "%s 在 %s" -#: kallithea/controllers/files.py:307 kallithea/controllers/files.py:367 -#: kallithea/controllers/files.py:434 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "版本库由%s于%s锁定" -#: kallithea/controllers/files.py:319 +#: kallithea/controllers/files.py:309 msgid "You can only delete files with revision being a valid branch" msgstr "您只能删除有效分支的修订中的文件" -#: kallithea/controllers/files.py:330 +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "删除文件 %s 通过 Kallithea" -#: kallithea/controllers/files.py:352 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "成功删除文件 %s" -#: kallithea/controllers/files.py:356 kallithea/controllers/files.py:422 -#: kallithea/controllers/files.py:503 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "提交时发生错误" -#: kallithea/controllers/files.py:379 +#: kallithea/controllers/files.py:369 msgid "You can only edit files with revision being a valid branch" msgstr "您只能编辑有效分支的修订中的文件" -#: kallithea/controllers/files.py:393 +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "已编辑文件 %s 通过 Kallithea" -#: kallithea/controllers/files.py:409 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "无变更" -#: kallithea/controllers/files.py:418 kallithea/controllers/files.py:492 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "成功提交到%s" -#: kallithea/controllers/files.py:445 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "已添加文件通过 Kallithea" -#: kallithea/controllers/files.py:466 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "无内容" -#: kallithea/controllers/files.py:470 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "无文件名" -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "" +#: kallithea/controllers/files.py:517 +msgid "Downloads disabled" +msgstr "下载已禁用" + #: kallithea/controllers/files.py:528 -msgid "Downloads disabled" -msgstr "下载已禁用" - -#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "未知版本%s" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "空版本库" -#: kallithea/controllers/files.py:543 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "未知包类型" -#: kallithea/controllers/files.py:773 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "修订集" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "分支" -#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "标签" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "在复刻版本库%s的时候发生错误" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "组" -#: kallithea/controllers/home.py:94 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:479 -#: kallithea/templates/base/base.html:653 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "版本库" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "分支" -#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "已关闭分支" -#: kallithea/controllers/home.py:151 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "标签" -#: kallithea/controllers/home.py:157 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "书签" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "公共日志" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:306 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "日志" -#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 msgid "Bad captcha" msgstr "验证码错误" -#: kallithea/controllers/login.py:150 +#: kallithea/controllers/login.py:148 +#, python-format msgid "You have successfully registered with %s" msgstr "您已成功注册 %s" -#: kallithea/controllers/login.py:195 +#: kallithea/controllers/login.py:193 msgid "A password reset confirmation code has been sent" msgstr "密码重置确认码已经发送" -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:242 msgid "Invalid password reset token" msgstr "无效的密码重置令牌" -#: kallithea/controllers/login.py:249 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "成功更新密码" -#: kallithea/controllers/pullrequests.py:123 -#, python-format -msgid "%s (closed)" -msgstr "%s (已关闭)" - -#: kallithea/controllers/pullrequests.py:151 -#: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 -msgid "Changeset" -msgstr "修订集" - -#: kallithea/controllers/pullrequests.py:172 -msgid "Special" -msgstr "特殊" - -#: kallithea/controllers/pullrequests.py:173 -msgid "Peer branches" -msgstr "同等分支" - -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 -msgid "Bookmarks" -msgstr "书签" - -#: kallithea/controllers/pullrequests.py:312 -#, python-format -msgid "Error creating pull request: %s" -msgstr "创建拉取请求出错：%s" - -#: kallithea/controllers/pullrequests.py:358 -#: kallithea/controllers/pullrequests.py:505 -msgid "No description" -msgstr "无描述" - -#: kallithea/controllers/pullrequests.py:365 -msgid "Successfully opened new pull request" -msgstr "成功提交拉取请求" - -#: kallithea/controllers/pullrequests.py:368 -#: kallithea/controllers/pullrequests.py:455 -#: kallithea/controllers/pullrequests.py:512 +#: kallithea/controllers/pullrequests.py:73 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "指定的审核者 \"%s\" 无效" -#: kallithea/controllers/pullrequests.py:371 -#: kallithea/controllers/pullrequests.py:458 +#: kallithea/controllers/pullrequests.py:135 +#, python-format +msgid "%s (closed)" +msgstr "%s (已关闭)" + +#: kallithea/controllers/pullrequests.py:162 +#: kallithea/templates/changeset/changeset.html:12 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 +msgid "Changeset" +msgstr "修订集" + +#: kallithea/controllers/pullrequests.py:183 +msgid "Special" +msgstr "特殊" + +#: kallithea/controllers/pullrequests.py:184 +msgid "Peer branches" +msgstr "同等分支" + +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 +msgid "Bookmarks" +msgstr "书签" + +#: kallithea/controllers/pullrequests.py:326 +#, python-format +msgid "Error creating pull request: %s" +msgstr "创建拉取请求出错：%s" + +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 msgid "Error occurred while creating pull request" msgstr "创建拉取请求时发生错误" -#: kallithea/controllers/pullrequests.py:403 -msgid "Missing changesets since the previous pull request:" -msgstr "缺少上次拉取请求之后的修订集：" +#: kallithea/controllers/pullrequests.py:358 +msgid "Successfully opened new pull request" +msgstr "成功提交拉取请求" + +#: kallithea/controllers/pullrequests.py:381 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" +msgstr "拉取请求更新已创建" #: kallithea/controllers/pullrequests.py:410 #, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "在上次拉取请求之后，在 %s %s 上的新修订集：" - -#: kallithea/controllers/pullrequests.py:417 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:426 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:464 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "已关闭，被 %s 替换。" - -#: kallithea/controllers/pullrequests.py:472 -msgid "Pull request update created" -msgstr "拉取请求更新已创建" - -#: kallithea/controllers/pullrequests.py:516 +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:414 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "无描述" + +#: kallithea/controllers/pullrequests.py:439 msgid "Pull request updated" msgstr "拉取请求已更新" -#: kallithea/controllers/pullrequests.py:531 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "成功删除拉取请求" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:491 +#, fuzzy, python-format +#| msgid "Changeset for %s %s not found in %s" +msgid "Revision %s not found in %s" +msgstr "未找到修订集" + +#: kallithea/controllers/pullrequests.py:518 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "没有找到更新此拉取请求的修订集。" + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:599 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:617 -#, python-format -msgid "The following changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:621 -msgid "No changesets found for updating this pull request." +#: kallithea/controllers/pullrequests.py:552 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:556 +#, fuzzy +#| msgid "No changesets found for updating this pull request." +msgid "No additional changesets found for iterating on this pull request." msgstr "没有找到更新此拉取请求的修订集。" -#: kallithea/controllers/pullrequests.py:629 +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:635 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:571 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:573 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "没有找到更新此拉取请求的修订集。" + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:738 +#: kallithea/controllers/pullrequests.py:676 #, fuzzy, python-format msgid "Successfully deleted pull request %s" msgstr "成功删除拉取请求" -#: kallithea/controllers/pullrequests.py:748 -msgid "Closing." -msgstr "关闭。" - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "错误的搜索。请尝试用引号包含它。" -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "没有索引用于搜索。请运行whoosh索引器" -#: kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "搜索操作期间发生错误。" -#: kallithea/controllers/summary.py:181 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 msgid "No data ready yet" msgstr "数据尚未就绪" -#: kallithea/controllers/summary.py:184 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "该版本库统计功能已经禁用" @@ -472,150 +512,154 @@ msgid "error occurred during update of auth settings" msgstr "验证设置更新时发生错误" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "默认设置已经成功更新" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "默认值更新时发生错误" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 #, fuzzy msgid "Forever" msgstr "检视者" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "5 minutes" msgstr "5 分钟" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 hour" msgstr "1 小时" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 msgid "1 day" msgstr "1 天" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "1 个月" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:290 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "终身" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "gist 创建时发生错误" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "已删除 gist %s" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:200 msgid "Unmodified" msgstr "未修改" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "成功更新 gist 内容" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "成功更新 gist 数据" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "gist %s 更新时发生错误" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "你的帐号已经更新完成" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:201 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "用户 %s 更新时发生错误" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "用户密码更新时发生错误" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "已为用户添加电子邮件 %s" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "保存电子邮件时发生错误" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "成功删除用户电子邮件" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "API 密钥创建成功" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "API 密钥重置成功" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:324 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "API 密钥删除成功" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "读" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" -msgstr "写" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" +msgstr "读" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "写" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -623,611 +667,642 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:336 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:344 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "管理" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "停用" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "已允许手动激活账号" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "已允许自动激活账号" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1705 -msgid "Manual activation of external account" -msgstr "外部账号手动激活" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1706 -msgid "Automatic activation of external account" -msgstr "外部账号自动激活" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "停用" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "已允许手动激活账号" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "已允许自动激活账号" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "外部账号手动激活" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "外部账号自动激活" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "启用" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "全局权限更新成功" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "权限更新时发生错误" -#: kallithea/controllers/admin/repo_groups.py:187 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:192 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:249 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:248 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:283 +#: kallithea/controllers/admin/repo_groups.py:258 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "这个组内有%s个版本库因而无法删除" -#: kallithea/controllers/admin/repo_groups.py:290 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:296 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:301 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:404 -#: kallithea/controllers/admin/repo_groups.py:439 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:456 -#: kallithea/controllers/admin/repos.py:397 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:151 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:212 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:221 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:224 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:261 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "版本库%s成功更新" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:309 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:312 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:317 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:320 +#: kallithea/controllers/admin/repos.py:289 #, fuzzy, python-format msgid "Cannot delete repository %s which still has forks" msgstr "无法删除%s因为它还有其他分复刻本库" -#: kallithea/controllers/admin/repos.py:325 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "在删除%s的时候发生错误" -#: kallithea/controllers/admin/repos.py:373 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:429 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:443 +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, fuzzy, python-format +#| msgid "An error occurred during deletion of user" +msgid "An error occurred during creation of field: %r" +msgstr "删除用户时发生错误" + +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:459 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:490 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "成功更新在公共日志中的可见性" -#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "设置版本库到公共日志时发生错误" -#: kallithea/controllers/admin/repos.py:511 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "无" -#: kallithea/controllers/admin/repos.py:513 +#: kallithea/controllers/admin/repos.py:473 #, python-format msgid "Marked repository %s as fork of %s" msgstr "成功将版本库%s标记为复刻自%s" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:480 msgid "An error occurred during this operation" msgstr "在搜索操作中发生错误" -#: kallithea/controllers/admin/repos.py:536 -#: kallithea/controllers/admin/repos.py:563 +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 #, fuzzy msgid "Repository has been locked" msgstr "版本库未锁定" -#: kallithea/controllers/admin/repos.py:539 -#: kallithea/controllers/admin/repos.py:560 +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 #, fuzzy msgid "Repository has been unlocked" msgstr "版本库未锁定" -#: kallithea/controllers/admin/repos.py:542 -#: kallithea/controllers/admin/repos.py:567 +#: kallithea/controllers/admin/repos.py:502 +#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during unlocking" msgstr "解锁时发生错误" -#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:533 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:585 +#: kallithea/controllers/admin/repos.py:537 msgid "An error occurred during cache invalidation" msgstr "清除缓存时发生错误" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "成功拉取自远程路径" -#: kallithea/controllers/admin/repos.py:603 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "从远程路径拉取时发生错误" -#: kallithea/controllers/admin/repos.py:636 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "删除版本库统计时发生错误" -#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "成功更新版本控制系统设置" -#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:151 -#: kallithea/controllers/admin/settings.py:248 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:187 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:244 +#: kallithea/controllers/admin/settings.py:189 +#, fuzzy, python-format +msgid "Invalidated %s repositories" +msgstr "清除版本库缓存" + +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "更新应用设置" -#: kallithea/controllers/admin/settings.py:301 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "成功更新可视化设置" -#: kallithea/controllers/admin/settings.py:306 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:347 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:378 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "新建钩子" -#: kallithea/controllers/admin/settings.py:392 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "更新钩子" -#: kallithea/controllers/admin/settings.py:396 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "Whoosh重新索引任务调度" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:208 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:219 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:224 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:242 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "保存权限时发生错误" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "用户更新成功" -#: kallithea/controllers/admin/users.py:217 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:222 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "删除用户时发生错误" -#: kallithea/controllers/admin/users.py:235 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:462 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:468 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:482 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:737 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:750 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/auth.py:768 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:813 +#: kallithea/lib/auth.py:829 msgid "You need to be a registered user to perform this action" msgstr "必须是注册用户才能进行此操作" -#: kallithea/lib/auth.py:843 +#: kallithea/lib/auth.py:857 msgid "You need to be signed in to view this page" msgstr "必须登录才能访问该页面" -#: kallithea/lib/base.py:493 +#: kallithea/lib/base.py:449 +msgid "Invalid API key" +msgstr "" + +#: kallithea/lib/base.py:508 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:623 -msgid "Changeset not found" +#: kallithea/lib/base.py:617 +#, fuzzy, python-format +msgid "Changeset for %s %s not found in %s" msgstr "未找到修订集" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "修订集过大并已被截断，使用差异菜单查看此差异" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "未发现差异" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "已经删除分支%s" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "创建标签%s" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:613 +#, fuzzy, python-format +msgid "Changeset %s not found" +msgstr "未找到修订集" + +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "显示所有合并的修订集 %s->%s" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 #, fuzzy msgid "Compare view" msgstr "比较显示" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "还有" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "%s个" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "修订" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, fuzzy, python-format msgid "Fork name %s" msgstr "复刻名称%s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, fuzzy, python-format msgid "Pull request %s" msgstr "拉取请求#%s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "[删除]版本库" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 msgid "[created] repository" msgstr "[创建]版本库" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "[创建]复刻版本库" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "[复刻]版本库" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "[更新]版本库" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "[删除]版本库" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "[创建]用户" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "[更新]用户" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "[评论]了版本库中的修订" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "[评论]拉取请求" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "[关闭] 拉取请求" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "[推送]到" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "[通过Kallithea提交]到版本库" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "[远程拉取]到版本库" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "[拉取]自" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "[开始关注]版本库" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "[停止关注]版本库" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr " 还有%s个" -#: kallithea/lib/helpers.py:1128 -#: kallithea/templates/compare/compare_diff.html:71 -#: kallithea/templates/pullrequests/pullrequest_show.html:337 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "无文件" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1469 +#: kallithea/lib/helpers.py:1230 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1235,1463 +1310,1160 @@ "repositories" msgstr "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启Kallithea以重新扫描版本库" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d年" -#: kallithea/lib/utils2.py:435 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d月" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d天" -#: kallithea/lib/utils2.py:437 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d时" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d分" -#: kallithea/lib/utils2.py:439 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d秒" -#: kallithea/lib/utils2.py:455 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "%s" -#: kallithea/lib/utils2.py:457 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "%s前" -#: kallithea/lib/utils2.py:459 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "%s零%s" -#: kallithea/lib/utils2.py:462 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "%s零%s前" -#: kallithea/lib/utils2.py:465 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "刚才" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "无版本库访问权限" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "版本库读取权限" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "版本库写入权限" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "版本库管理权限" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "无版本库组访问权限" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "版本库组读取权限" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "版本库组写入" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "版本库组管理权限" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1669 -msgid "Kallithea Administrator" -msgstr "Kallithea 管理员" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "禁用创建版本库" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "允许创建版本库" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "禁用复刻版本库" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "允许复刻版本库" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "禁用注册" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "用手动激活注册新用户" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "用自动激活注册新用户" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "未检视" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2237 -msgid "Approved" -msgstr "已批准" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2238 -msgid "Rejected" -msgstr "驳回" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "检视中" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1518 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1701 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1695 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1696 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "在%s行" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "[提及]" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1715 +msgid "Kallithea Administrator" +msgstr "Kallithea 管理员" + +#: kallithea/model/db.py:1717 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 +#: kallithea/model/db.py:1718 #, fuzzy msgid "Default user has read access to new repositories" msgstr "未授权的资源访问" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1719 #, fuzzy msgid "Default user has write access to new repositories" msgstr "未授权的资源访问" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1720 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1722 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 +#: kallithea/model/db.py:1723 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1724 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1725 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1727 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1728 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1729 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1730 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1732 #, fuzzy msgid "Only admins can create repository groups" msgstr "没有在该版本库组中创建版本库的权限" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1733 #, fuzzy msgid "Non-admins can create repository groups" msgstr "没有在该版本库组中创建版本库的权限" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1735 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1736 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1692 +#: kallithea/model/db.py:1738 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1693 +#: kallithea/model/db.py:1739 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1741 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1742 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1744 #, fuzzy msgid "Only admins can fork repositories" msgstr "创建版本库" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1745 #, fuzzy msgid "Non-admins can fork repositories" msgstr "创建版本库" -#: kallithea/model/db.py:1702 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1748 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1749 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2236 +#: kallithea/model/db.py:2276 #, fuzzy msgid "Not reviewed" msgstr "未检视" -#: kallithea/model/db.py:2239 +#: kallithea/model/db.py:2277 #, fuzzy msgid "Under review" msgstr "检视中" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2278 +#, fuzzy +#| msgid "Approved" +msgid "Not approved" +msgstr "已批准" + +#: kallithea/model/db.py:2279 +msgid "Approved" +msgstr "已批准" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "请登录" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "输入一个不少于%(min)i个字符的值" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "请输入密码" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "输入少于%(min)i个字符" -#: kallithea/model/forms.py:165 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:240 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s 已评论修订集在 %(age)s" -#: kallithea/model/notification.py:255 +#: kallithea/model/notification.py:241 #, python-format msgid "%(user)s sent message %(age)s" msgstr "" -#: kallithea/model/notification.py:256 +#: kallithea/model/notification.py:242 #, python-format msgid "%(user)s mentioned you %(age)s" msgstr "" -#: kallithea/model/notification.py:257 +#: kallithea/model/notification.py:243 #, python-format msgid "%(user)s registered in Kallithea %(age)s" msgstr "" -#: kallithea/model/notification.py:258 +#: kallithea/model/notification.py:244 #, fuzzy, python-format msgid "%(user)s opened new pull request %(age)s" msgstr "成功提交拉取请求" -#: kallithea/model/notification.py:259 +#: kallithea/model/notification.py:245 #, fuzzy, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "[评论]拉取请求" -#: kallithea/model/notification.py:266 +#: kallithea/model/notification.py:252 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s 已评论修订集于 %(when)s" -#: kallithea/model/notification.py:267 +#: kallithea/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "" -#: kallithea/model/notification.py:268 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "" -#: kallithea/model/notification.py:269 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" -#: kallithea/model/notification.py:270 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:271 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:302 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +#: kallithea/model/notification.py:288 +#, fuzzy, python-format +#| msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" msgstr "[评论] %(repo_name)s 修订集 %(short_id)s 在 %(branch)s" -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:291 #, fuzzy, python-format msgid "New user %(new_username)s registered" msgstr "用户名称 %(new_username)s 无效" +#: kallithea/model/notification.py:293 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:307 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:308 -#, fuzzy, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "[评论]拉取请求" - -#: kallithea/model/notification.py:321 #, fuzzy msgid "Closing" msgstr "使用中" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:708 +#: kallithea/model/pull_request.py:211 +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Cannot create empty pull request" +msgstr "创建拉取请求出错：%s" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +#, fuzzy +#| msgid "Confirm to delete this pull request" +msgid "You are not authorized to create the pull request" +msgstr "确认删除拉取请求" + +#: kallithea/model/pull_request.py:341 +#, fuzzy +#| msgid "Missing changesets since the previous pull request:" +msgid "Missing changesets since the previous iteration:" +msgstr "缺少上次拉取请求之后的修订集：" + +#: kallithea/model/pull_request.py:348 +#, fuzzy, python-format +#| msgid "New changesets on %s %s since the previous pull request:" +msgid "New changesets on %s %s since the previous iteration:" +msgstr "在上次拉取请求之后，在 %s %s 上的新修订集：" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, fuzzy, python-format +#| msgid "New changesets on %s %s since the previous pull request:" +msgid "No changes found on %s %s since previous iteration." +msgstr "在上次拉取请求之后，在 %s %s 上的新修订集：" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "最新tip版本" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 #, fuzzy msgid "You can't remove this user since it is crucial for the entire application" msgstr "由于是系统帐号，无法删除该用户" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" " owners or remove those repository groups: %s" msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" -#: kallithea/model/user.py:368 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:418 +#: kallithea/model/user.py:413 #, fuzzy msgid "Password reset notification" msgstr "确认密码" -#: kallithea/model/user.py:419 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "值不能为空" -#: kallithea/model/validators.py:96 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "用户名称%(username)s已经存在" -#: kallithea/model/validators.py:98 +#: kallithea/model/validators.py:75 #, fuzzy, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "用户名称 %(username)s 无效" -#: kallithea/model/validators.py:100 +#: kallithea/model/validators.py:77 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" msgstr "" -#: kallithea/model/validators.py:127 +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:111 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "用户名称 %(username)s 无效" + +#: kallithea/model/validators.py:131 +msgid "Invalid user group name" +msgstr "" + +#: kallithea/model/validators.py:132 +#, python-format +msgid "User group \"%(usergroup)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:134 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "用户名称 %(username)s 无效" - -#: kallithea/model/validators.py:154 -msgid "Invalid user group name" -msgstr "" - -#: kallithea/model/validators.py:155 -#, python-format -msgid "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:157 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:197 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "不能将这个组作为parent" -#: kallithea/model/validators.py:198 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "组 \"%(group_name)s\" 已经存在" -#: kallithea/model/validators.py:200 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "已经存在名为 \"%(group_name)s\" 的版本库" -#: kallithea/model/validators.py:258 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "密码含有无效（非ASCII）字符" -#: kallithea/model/validators.py:273 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:289 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "密码不符" -#: kallithea/model/validators.py:304 +#: kallithea/model/validators.py:279 #, fuzzy msgid "Invalid username or password" msgstr "无效密码" -#: kallithea/model/validators.py:335 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "令牌不匹配" -#: kallithea/model/validators.py:351 +#: kallithea/model/validators.py:326 #, fuzzy, python-format msgid "Repository name %(repo)s is not allowed" msgstr "版本库名称不能为%(repo)s" -#: kallithea/model/validators.py:353 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "已经存在版本库%(repo)s" -#: kallithea/model/validators.py:354 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "版本库组 \"%(group)s\" 中已经存在版本库 \"%(repo)s\"" -#: kallithea/model/validators.py:356 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:470 +#: kallithea/model/validators.py:449 #, fuzzy msgid "Invalid repository URL" msgstr "私有版本库" -#: kallithea/model/validators.py:471 +#: kallithea/model/validators.py:450 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:496 +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "复刻版本库必须和父版本库类型相同" -#: kallithea/model/validators.py:511 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "没有在该版本库组中创建版本库的权限" -#: kallithea/model/validators.py:513 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:563 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:604 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:697 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "不是一个合法的路径" -#: kallithea/model/validators.py:714 +#: kallithea/model/validators.py:692 #, fuzzy msgid "This email address is already in use" msgstr "该邮件地址已被使用" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:712 #, fuzzy, python-format msgid "Email address \"%(email)s\" not found" msgstr "邮件地址\"%(email)s\"不存在" -#: kallithea/model/validators.py:771 +#: kallithea/model/validators.py:749 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "LDAP 登陆属性的 CN 必须指定 - 这个名字作为用户名" -#: kallithea/model/validators.py:783 +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:784 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:831 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:847 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "控制面板" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "快速过滤..." - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "版本库" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +#, fuzzy +#| msgid "Repository group" +msgid "Repository Group" +msgstr "版本库组" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "描述" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "名称" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "版本库" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "最后修改" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" msgstr "Tip" -#: kallithea/templates/index_base.html:132 +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:244 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "所有者" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "点击以升序排列" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "点击以降序排列" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "数据错误。" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "载入中..." - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:414 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "登录" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "帐号" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "密码" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "记住密码" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "忘记了密码？" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "还没有帐号？" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "登录" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 -#, fuzzy, python-format +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 +#, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 #, fuzzy msgid "Reset Your Password" msgstr "忘记了密码？" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 #, fuzzy msgid "Send Password Reset Email" msgstr "确认新密码" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 #, fuzzy msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "密码重置地址已经发送到邮件" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 #, fuzzy msgid "New Password" msgstr "新密码" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 #, fuzzy msgid "Confirm New Password" msgstr "新密码" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "注册" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "确认密码" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "名" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "姓" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "电子邮件" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "没有任何分支" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "没有任何标签" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "无书签" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 #, fuzzy msgid "Admin Journal" msgstr "系统日志" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "日志过滤..." #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 #, fuzzy msgid "Filter" msgstr "过滤" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, fuzzy, python-format msgid "%s Entry" msgid_plural "%s Entries" msgstr[0] "%s条" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "操作" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "版本库" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "日期" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "来源IP" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "无操作" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "保存" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 #, fuzzy msgid "Repository Defaults" msgstr "版本库默认设置" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "类型" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 msgid "Private repository" msgstr "私有版本库" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "私有版本库只对成员可见。" -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 msgid "Enable statistics" msgstr "启用统计" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 msgid "Enable statistics window on summary page." msgstr "启用概况页面上的统计窗口。" -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 msgid "Enable downloads" msgstr "启用下载" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 msgid "Enable download menu on summary page." msgstr "启用概况页面上的下载菜单。" -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 msgid "Enable locking" msgstr "启用锁定" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "启用版本库的拉取锁定。" @@ -2700,322 +2472,475 @@ msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 #, fuzzy msgid "Never" msgstr "检视者" -#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:147 -#: kallithea/templates/changeset/changeset_file_comment.html:105 +#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, python-format msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, python-format msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "重置" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:31 -#: kallithea/templates/changeset/changeset_file_comment.html:95 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "删除" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:431 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "我的账户" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 #, fuzzy msgid "Email Addresses" msgstr "增加邮箱" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 #, fuzzy msgid "Owned Repositories" msgstr "版本库" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 #, fuzzy msgid "Watched Repositories" msgstr "创建版本库" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 #, fuzzy msgid "Show Permissions" msgstr "拷贝权限" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, fuzzy, python-format msgid "Confirm to reset this API key: %s" msgstr "确认删除用户：%s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, fuzzy, python-format msgid "Confirm to remove this API key: %s" msgstr "确认删除用户：%s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 #, fuzzy msgid "Remove" msgstr "移除" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "增加" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "确认删除邮箱：%s" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "增加邮箱" @@ -3024,320 +2949,414 @@ msgid "Change Your Account Password" msgstr "忘记了密码？" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "新密码" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, fuzzy, python-format +#| msgid "Change your avatar at" +msgid "Change %s avatar at" msgstr "修改你的头像" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "使用" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 #, fuzzy msgid "Repositories You Own" msgstr "版本库" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "没有找到记录。" +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" +msgstr "名称" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 #, fuzzy msgid "Repositories You are Watching" msgstr "版本库路径" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "我的通知" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "全部" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "评论" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 #, fuzzy msgid "Mark All Read" msgstr "全部标记为已读" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +#, fuzzy +#| msgid "Mark All Read" +msgid "Mark as read" +msgstr "全部标记为已读" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "无通知" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 #, fuzzy msgid "Show Notification" msgstr "显示通知" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:430 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "通知" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 #, fuzzy msgid "Default Permissions" msgstr "默认权限" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "匿名访问" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 #, fuzzy msgid "Apply to all existing repositories" msgstr "已有版本库？" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 msgid "Permissions for the Default user on new repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 msgid "Repository group" msgstr "版本库组" -#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 #, fuzzy msgid "Apply to all existing repository groups" msgstr "已有版本库？" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 #, fuzzy msgid "Top level repository creation" msgstr "建立版本库" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 msgid "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "版本库复刻" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "注册" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, fuzzy, python-format msgid "Confirm to delete this IP address: %s" msgstr "确认删除用户：%s" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "组名" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "上级组" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "设置" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "权限" @@ -3361,12 +3380,14 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "创建于" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3376,16 +3397,36 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "Disabled" +msgid "Visible" +msgstr "停用" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "No response" +msgid "Add repos" +msgstr "无响应" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy @@ -3394,114 +3435,126 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy msgid "Revoke" msgstr "移除" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #, fuzzy msgid "Apply to children" msgstr "应用到成员" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" msgstr "启用组的拉取锁定。这个选项将应用到组内的其他组和版本库" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 #, fuzzy msgid "Confirm to delete this group" msgstr "确认删除用户：%s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" +#, fuzzy, python-format +#| msgid "Repository group" +msgid "Repository group %s" +msgstr "版本库组" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "首页" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "有" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 #, fuzzy msgid "Repository Groups Administration" msgstr "版本库管理员" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 #, fuzzy msgid "Number of Top-level Repositories" msgstr "顶层版本库数量" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 #, fuzzy msgid "Clone remote repository" msgstr "[创建]版本库" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "保持简短。用README文件来写更长的描述。" -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "可选的选择一个组将版本库放到其中。" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "要创建的版本库类型。" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "默认修订" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:9 -#, fuzzy, python-format +#, python-format msgid "%s Creating Repository" msgstr "" @@ -3523,101 +3576,122 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, fuzzy, python-format +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 +#, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "远程" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "统计" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 #, fuzzy msgid "Parent" msgstr "上级组" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 #, fuzzy msgid "Manually set this repository as a fork of another from the list." msgstr "从列表中手动设置这个版本库复刻自另一版本库" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 #, fuzzy msgid "Public Journal Visibility" msgstr "公共日志" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "从公共日志删除" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 #, fuzzy msgid "Add to Public Journal" msgstr "公共日志" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 #, fuzzy msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "任何人都可以在公共日志上看到这个版本库上的所有动作" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 #, fuzzy msgid "Change Locking" msgstr "启用锁定" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 #, fuzzy msgid "Confirm to unlock repository." msgstr "确认解锁版本库" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 #, fuzzy msgid "Unlock Repository" msgstr "公共版本库" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 #, python-format msgid "Locked by %s on %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 #, fuzzy msgid "Confirm to lock repository." msgstr "确认锁定版本库" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 #, fuzzy msgid "Lock Repository" msgstr "公共版本库" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "版本库未锁定" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3625,32 +3699,39 @@ "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "确认删除版本库：%s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 #, fuzzy msgid "Delete this Repository" msgstr "[删除]版本库" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 -#, fuzzy, python-format +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 +#, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3662,109 +3743,119 @@ msgid "Invalidate Repository Cache" msgstr "清除版本库缓存" -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 #, fuzzy msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "手动清除版本库缓存。之后第一次访问的时候将重建缓存" -#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 #, fuzzy msgid "List of Cached Values" msgstr "缓存值列表" -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "Prefix" msgstr "前缀" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "键" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "启用" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 #, fuzzy msgid "Extra fields are disabled." msgstr "禁用注册" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "私有版本库" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "[forked] repository" +msgid "Fork of repository" +msgstr "[复刻]版本库" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "[创建]版本库" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 #, fuzzy msgid "Pull Changes from Remote Repository" msgstr "[远程拉取]到版本库" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 #, fuzzy msgid "Confirm to pull changes from remote repository." msgstr "确认从远程拉取修订集" -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 #, fuzzy msgid "Permanent Repository ID" msgstr "私有版本库" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3774,35 +3865,35 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "[创建]版本库" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 #, fuzzy msgid "Repository URL" msgstr "版本库" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "文件浏览、下载、whoosh和README的默认修订版本" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "修改这个版本库的所有者。" -#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 msgid "Processed commits" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 msgid "Processed progress" msgstr "" @@ -3817,319 +3908,380 @@ msgstr "确认移除当前统计" #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 #, fuzzy msgid "Repositories Administration" msgstr "版本库管理员" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 #, fuzzy msgid "Settings Administration" msgstr "系统设置" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "钩子" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "发送" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems like Google" +" Analytics or Piwik, but also to perform " +"instance-specific customizations like adding a " +"project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 #, fuzzy msgid "Save Settings" msgstr "保存设置" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 #, fuzzy msgid "Custom Hooks" msgstr "自定义钩子" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "移除钩子失败" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Description" +msgid "Rescan options" +msgstr "描述" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 msgid "" "Check this option to remove all comments, pull requests and other records" " related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 +msgid "Install Git hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 +#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " "not seem to come from Kallithea. WARNING: This operation will destroy any" " custom git hooks you may have deployed by hand!" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/templates/admin/settings/settings_mapping.html:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "重新索引" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 +msgid "Kallithea configuration file" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 +msgid "Python version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 #, fuzzy msgid "Git version" msgstr "编辑权限" -#: kallithea/templates/admin/settings/settings_system.html:9 +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "网络" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "推送后显示版本库大小" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "记录用户推送命令" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "记录用户拉取命令" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "推送后更新版本库（hg update）" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 #, fuzzy msgid "Mercurial extensions" msgstr "Mercurial扩展" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 msgid "Enable hgsubversion extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 #, fuzzy msgid "Location of repositories" msgstr "创建版本库" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting" " take effect." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "通用" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4146,103 +4298,128 @@ "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +#, fuzzy +msgid "Clone URL" +msgstr "克隆地址" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." "\n" -" The following " +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user" +" username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "repositories" +msgid "Repository page size" +msgstr "版本库" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 msgid "Icons" msgstr "图标" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 msgid "Show public repository icon on repositories" msgstr "显示公共版本库图标" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 msgid "Show private repository icon on repositories" msgstr "显示私有版本库图标" -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 #, fuzzy msgid "Show public/private icons next to repository names." msgstr "显示公共版本库图标" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 #, fuzzy msgid "Meta Tagging" msgstr "元标记" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 #, fuzzy msgid "Show Members" msgstr "成员" @@ -4253,13 +4430,15 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "成员" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4268,49 +4447,60 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "还没有成员" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "启用成员" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 #, fuzzy msgid "User Groups Administration" msgstr "用户管理员" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "添加用户" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "用户" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "确认密码" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "" @@ -4320,12 +4510,14 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "" @@ -4334,7 +4526,8 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "确认删除用户：%s" @@ -4343,443 +4536,507 @@ msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "确认新密码" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 #, fuzzy msgid "Users Administration" msgstr "用户管理员" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "Mercurial版本库" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "Git版本库" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 #, fuzzy msgid "Create Fork" msgstr "创建于" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "概况" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "修订记录" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "浏览" -#: kallithea/templates/base/base.html:142 -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 msgid "Options" msgstr "选项" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:147 +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 #, fuzzy msgid "Compare Fork" msgstr "比较复刻" -#: kallithea/templates/base/base.html:154 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 msgid "Compare" msgstr "比较显示" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:331 +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 msgid "Search" msgstr "搜索" -#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:155 +#: kallithea/tests/data/templates/base/base.html.py:399 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:157 +#: kallithea/tests/data/templates/base/base.html.py:405 msgid "Lock" msgstr "" +#: kallithea/templates/base/base.html:165 +#: kallithea/tests/data/templates/base/base.html.py:413 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 +msgid "Fork" +msgstr "复刻" + #: kallithea/templates/base/base.html:170 -msgid "Follow" -msgstr "" - -#: kallithea/templates/base/base.html:171 -msgid "Unfollow" -msgstr "" - -#: kallithea/templates/base/base.html:174 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" -msgstr "复刻" +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 +msgid "Create Pull Request" +msgstr "" #: kallithea/templates/base/base.html:175 -#: kallithea/templates/pullrequests/pullrequest.html:88 -msgid "Create Pull Request" -msgstr "" - -#: kallithea/templates/base/base.html:180 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:485 +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:305 +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "" +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 +msgid "Public journal" +msgstr "公共日志" + +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 +msgid "Gists" +msgstr "" + #: kallithea/templates/base/base.html:311 -#: kallithea/templates/base/base.html:312 -msgid "Public journal" -msgstr "公共日志" - -#: kallithea/templates/base/base.html:317 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:318 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:322 +#: kallithea/tests/data/templates/base/base.html.py:525 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:330 +#: kallithea/templates/base/base.html:319 +#: kallithea/tests/data/templates/base/base.html.py:540 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:353 -#: kallithea/templates/base/base.html:354 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 #, fuzzy msgid "My Pull Requests" msgstr "拉取请求" -#: kallithea/templates/base/base.html:377 +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:384 +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 #, fuzzy msgid "Login to Your Account" msgstr "登录" -#: kallithea/templates/base/base.html:407 -msgid "Forgot password ?" +#: kallithea/templates/base/base.html:385 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" msgstr "忘记密码？" -#: kallithea/templates/base/base.html:434 +#: kallithea/templates/base/base.html:389 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "还没有帐号？" + +#: kallithea/templates/base/base.html:407 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "退出" -#: kallithea/templates/base/base.html:615 -msgid "Keyboard shortcuts" -msgstr "" - -#: kallithea/templates/base/base.html:624 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 #, fuzzy msgid "Inherit defaults" msgstr "版本库默认设置" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "创建版本库" +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "复刻版本库" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "显示" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "权限" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "编辑权限" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 +#: kallithea/templates/base/root.html:25 +#: kallithea/tests/data/templates/base/root.html.py:85 #, fuzzy msgid "Add Another Comment" msgstr "%d条评论" -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 +#: kallithea/templates/base/root.html:26 +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 msgid "Stop following this repository" msgstr "停止关注该版本库" -#: kallithea/templates/base/root.html:24 +#: kallithea/templates/base/root.html:27 +#: kallithea/tests/data/templates/base/root.html.py:89 msgid "Start following this repository" msgstr "开始关注该版本库" -#: kallithea/templates/base/root.html:25 +#: kallithea/templates/base/root.html:28 +#: kallithea/tests/data/templates/base/root.html.py:91 msgid "Group" msgstr "组" -#: kallithea/templates/base/root.html:26 +#: kallithea/templates/base/root.html:29 +#: kallithea/tests/data/templates/base/root.html.py:93 msgid "members" msgstr "成员" -#: kallithea/templates/base/root.html:27 +#: kallithea/templates/base/root.html:30 +#: kallithea/tests/data/templates/base/root.html.py:95 msgid "Loading ..." msgstr "" -#: kallithea/templates/base/root.html:28 -msgid "loading ..." -msgstr "" - -#: kallithea/templates/base/root.html:29 -msgid "Search truncated" -msgstr "" - -#: kallithea/templates/base/root.html:30 -msgid "No matching files" -msgstr "" - #: kallithea/templates/base/root.html:31 +#: kallithea/tests/data/templates/base/root.html.py:97 +msgid "loading ..." +msgstr "" + +#: kallithea/templates/base/root.html:32 +#: kallithea/tests/data/templates/base/root.html.py:99 +msgid "Search truncated" +msgstr "" + +#: kallithea/templates/base/root.html:33 +#: kallithea/tests/data/templates/base/root.html.py:101 +msgid "No matching files" +msgstr "" + +#: kallithea/templates/base/root.html:34 +#: kallithea/tests/data/templates/base/root.html.py:103 #, fuzzy msgid "Open New Pull Request from {0}" msgstr "[评论]拉取请求" -#: kallithea/templates/base/root.html:32 +#: kallithea/templates/base/root.html:35 +#: kallithea/tests/data/templates/base/root.html.py:105 msgid "Open New Pull Request for {0} → {1}" msgstr "" -#: kallithea/templates/base/root.html:33 +#: kallithea/templates/base/root.html:36 +#: kallithea/tests/data/templates/base/root.html.py:107 msgid "Show Selected Changesets {0} → {1}" msgstr "显示选中的修订集 {0} → {1}" -#: kallithea/templates/base/root.html:34 +#: kallithea/templates/base/root.html:37 +#: kallithea/tests/data/templates/base/root.html.py:109 #, fuzzy msgid "Selection Link" msgstr "选择链接" -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/base/root.html:38 +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 #, fuzzy msgid "Collapse Diff" msgstr "文件差异" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:39 +#: kallithea/tests/data/templates/base/root.html.py:113 #, fuzzy msgid "Expand Diff" msgstr "文件差异" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:40 +#: kallithea/tests/data/templates/base/root.html.py:115 msgid "Failed to revoke permission" msgstr "" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "" -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/base/root.html:42 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "选择修订集" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 msgid "Specify changeset" msgstr "指定修订集" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "%s书签" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "作者" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "修订" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "%s分支" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "点击以升序排列" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "点击以降序排列" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "没有找到记录。" + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "数据错误。" + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." +msgstr "载入中..." #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "%s修订记录" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "显示%d/%d个版本" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "清除选择" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 #, fuzzy msgid "Go to tip of repository" msgstr "确认锁定版本库" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 #, fuzzy msgid "Branch filter:" msgstr "过滤" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 #, python-format msgid "" "Changeset status: %s by %s\n" @@ -4788,522 +5045,757 @@ "修订集状态：%s 由 %s\n" "点击打开相关联的拉取请求 %s" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/changelog/changelog_summary_data.html:24 -#, python-format -#| msgid "Changeset status" +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 +#, python-format msgid "Changeset status: %s by %s" msgstr "修订集状态：%s 由 %s" -#: kallithea/templates/changelog/changelog.html:116 -#: kallithea/templates/compare/compare_cs.html:63 +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 msgid "Expand commit message" msgstr "" -#: kallithea/templates/changelog/changelog.html:125 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/changelog/changelog.html:116 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "修订集有评论" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:57 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:141 -#: kallithea/templates/changelog/changelog_summary_data.html:63 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#: kallithea/templates/compare/compare_cs.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:203 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:146 -#: kallithea/templates/changelog/changelog_summary_data.html:68 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:311 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "没有任何变更" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:47 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "修订" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "作者" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "通过Kallithea直接添加或者上传文件" -#: kallithea/templates/changelog/changelog_summary_data.html:87 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:93 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 #, fuzzy msgid "Push new repository" msgstr "推送新版本库" -#: kallithea/templates/changelog/changelog_summary_data.html:101 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "已有版本库？" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "%s 修订集" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:39 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "修订集状态" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:75 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 #, fuzzy msgid "Merge" msgstr "合并" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 #, fuzzy msgid "Grafted from:" msgstr "创建于" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 #, fuzzy msgid "Replaced by:" msgstr "创建于" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 #, fuzzy msgid "Preceded by:" msgstr "创建于" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:329 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "修改%s个文件" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:62 -#: kallithea/templates/pullrequests/pullrequest_show.html:331 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "修改%s个文件包括%s行插入和%s行删除" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:231 -#: kallithea/templates/changeset/changeset.html:268 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 #, fuzzy msgid "No revisions" msgstr "修订" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 #, fuzzy msgid "on pull request" msgstr "[评论]拉取请求" -#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 #, fuzzy msgid "No title" msgstr "无文件" -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 msgid "on this changeset" msgstr "在此修订集" -#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 #, fuzzy msgid "Delete comment?" msgstr "%d条评论" -#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 #, fuzzy msgid "Status change" msgstr "文件已更改" -#: kallithea/templates/changeset/changeset_file_comment.html:59 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 #, fuzzy msgid "Commenting on line." msgstr "在{1}行上评论" -#: kallithea/templates/changeset/changeset_file_comment.html:60 +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 #, fuzzy msgid "" "Comments are in plain text. Use @username inside this text to notify " "another user." msgstr "在文本中使用 @用户名 以发送通知到该Kallithea用户" -#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 msgid "Set changeset status" msgstr "设置修订集状态" -#: kallithea/templates/changeset/changeset_file_comment.html:69 +#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:75 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 #, fuzzy msgid "No change" msgstr "无变更" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 #, fuzzy msgid "Finish pull request" msgstr "[评论]拉取请求" -#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 #, fuzzy msgid "Close" msgstr "已关闭" -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 #, fuzzy msgid "Submitting ..." msgstr "提交中……" -#: kallithea/templates/changeset/changeset_file_comment.html:104 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "评论" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "您必须登录才能评论。" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "现在登陆" -#: kallithea/templates/changeset/changeset_file_comment.html:116 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "隐藏" -#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d条评论" -#: kallithea/templates/changeset/changeset_file_comment.html:129 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, fuzzy, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "(%d内嵌)" -#: kallithea/templates/changeset/changeset_file_comment.html:130 -#, fuzzy, python-format +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 +#, python-format msgid "%d general" msgid_plural "%d general" msgstr[0] "" #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "%s 修订集" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "修订集状态：%s" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "影响文件" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "文件已删除" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "未修改" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 #, fuzzy msgid "Deleted" msgstr "删除" -#: kallithea/templates/changeset/diff_block.html:57 +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 #, fuzzy msgid "Renamed" msgstr "读" -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "未知版本%s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "无文件名" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "文件已添加" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:69 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:83 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "" #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "无修订集" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "修订集状态：%s" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "此列表中首个（最旧）修订集" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "此列表中末个（最近）修订集" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "修订集在此列表中的位置" -#: kallithea/templates/compare/compare_cs.html:85 +#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:321 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:99 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:107 +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:108 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, python-format msgid "%s changesets" msgstr "%s 修订集" -#: kallithea/templates/compare/compare_cs.html:109 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 #, fuzzy msgid "behind" msgstr "重新索引" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "" #: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "" #: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "显示%s个提交" -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "公共版本库" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "尚无任何修订集" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "订阅%s的RSS" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "订阅%s的Atom" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "%(user)s 已评论修订集在 %(age)s" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Comment on Changeset \"%s\"" +msgstr "%(user)s 已评论修订集在 %(age)s" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset" +msgid "Changeset on" +msgstr "修订集" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "分支" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "文件已更改" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "Repository has been locked" +msgid "The pull request has been closed." +msgstr "版本库未锁定" + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 #, fuzzy msgid "We have received a request to reset the password for your account." msgstr "我们收到重置你用户密码的请求。" -#: kallithea/templates/email_templates/password_reset.html:8 +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 msgid "" "This account is however managed outside this system and the password " "cannot be changed here." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:13 +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 +#: kallithea/templates/email_templates/pull_request.html:4 #, fuzzy, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, fuzzy, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#| msgid "[commented] on pull request for" +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "[评论]拉取请求" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "on pull request" +msgid "Pull request from" +msgstr "[评论]拉取请求" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +#, fuzzy +#| msgid "Date" +msgid "at" +msgstr "日期" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, fuzzy, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -#, fuzzy -msgid "The comment closed the pull request with status" +#| msgid "%(user)s commented on pull request %(age)s" +msgid "Mention in Comment on Pull Request %s \"%s\"" msgstr "[评论]拉取请求" -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "查看用户" +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s from %s#%s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "拉取请求#%s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "[评论]拉取请求" + +#: kallithea/templates/email_templates/registration.html:22 +#, fuzzy +#| msgid "Group name" +msgid "Full Name" +msgstr "组名" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5321,85 +5813,107 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "位置" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "或者" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 +#: kallithea/tests/data/templates/files/files_add.html.py:241 #, fuzzy msgid "New file type" msgstr "未知包类型" -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 #, fuzzy msgid "Commit Changes" msgstr "提交修改" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "加载文件列表..." -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 msgid "Size" msgstr "大小" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 msgid "Last Revision" msgstr "最后修订号" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 #, fuzzy msgid "Last Modified" msgstr "最后修改于" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 #, fuzzy msgid "Last Committer" msgstr "最后提交者" @@ -5410,7 +5924,7 @@ msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5423,109 +5937,129 @@ msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "编辑文件" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "%s个作者" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, fuzzy, python-format +#| msgid "Deleted branch: %s" +msgid "Edit on Branch: %s" +msgstr "已经删除分支%s" + +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "二进制文件（%s）" -#: kallithea/templates/files/files_source.html:74 +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 #, fuzzy msgid "File is too big to display." msgstr "文件过大，不能显示" -#: kallithea/templates/files/files_source.html:76 +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 msgid "Show full annotation anyway." msgstr "" -#: kallithea/templates/files/files_source.html:78 +#: kallithea/templates/files/files_source.html:73 +#: kallithea/tests/data/templates/files/files_source.html.py:133 msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "显示注释" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "指定的路径中没有文件" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "%s个关注者" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "关注者" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "开始关注 -" @@ -5534,71 +6068,81 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "复刻名称" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 #, fuzzy msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "文件浏览、下载、whoosh和README的默认修订版本" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "私有" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "拷贝权限" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "从被复刻版本库拷贝权限" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "克隆后更新" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "完成克隆后检出源代码" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "%s个复刻" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "复刻" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "无复刻" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 msgid "ATOM journal feed" msgstr "订阅日志ATOM" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "订阅日志RSS" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "没有条目" @@ -5612,35 +6156,46 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 #, fuzzy msgid "New Pull Request" msgstr "新建拉取请求" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "标题" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "" @@ -5677,7 +6232,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "已关闭" @@ -5696,128 +6253,161 @@ msgstr "确认删除拉取请求" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, fuzzy, python-format msgid "%s Pull Request %s" msgstr "拉取请求#%s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, fuzzy, python-format msgid "Pull request %s from %s#%s" msgstr "拉取请求#%s" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 #, fuzzy msgid "Summarize the changes" msgstr "提交修改" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "还未检视的检视人员" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "%d个检视者" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 #, fuzzy msgid "There are no reviewers" msgstr "没有任何分支" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 #, fuzzy msgid "on" msgstr "无" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -#, fuzzy -msgid "Update" -msgstr "[更新]用户" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 +#, fuzzy +#| msgid "Registration" +msgid "Next iteration" +msgstr "注册" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:215 +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 msgid "" -"Pull requests do not change once created. Select a revision and save to " -"replace this pull request with a new one." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:224 +"Pull request iterations do not change content once created. Select a " +"revision and save to make a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +#, fuzzy +msgid "Cancel Changes" +msgstr "无变更" + +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 #, fuzzy msgid "Pull Request Reviewers" msgstr "拉取请求检视人员" -#: kallithea/templates/pullrequests/pullrequest_show.html:249 +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 #, fuzzy msgid "Remove reviewer" msgstr "检视者" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:269 +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 #, fuzzy msgid "Potential Reviewers" msgstr "%d个检视者" -#: kallithea/templates/pullrequests/pullrequest_show.html:272 +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:295 -msgid "Save Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:296 -#, fuzzy -msgid "Save Updates as New Pull Request" -msgstr "新建拉取请求" - -#: kallithea/templates/pullrequests/pullrequest_show.html:297 -#, fuzzy -msgid "Cancel Changes" -msgstr "无变更" - -#: kallithea/templates/pullrequests/pullrequest_show.html:307 +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 #, fuzzy msgid "Pull Request Content" msgstr "拉取请求" +#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +msgid "Common ancestor" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5833,252 +6423,474 @@ msgid "Pull Requests to '%s'" msgstr "拉取请求#%s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 #, fuzzy msgid "Open New Pull Request" msgstr "新建拉取请求" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, fuzzy, python-format msgid "Show Pull Requests to %s" msgstr "拉取请求#%s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 -#, fuzzy, python-format +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 +#, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 #, fuzzy msgid "Pull Requests Created by Me" msgstr "拉取请求检视人员" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +#, fuzzy +#| msgid "Pull Request Reviewers" +msgid "Pull Requests Needing My Review" +msgstr "拉取请求检视人员" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 #, fuzzy msgid "Pull Requests I Participate In" msgstr "我参与的" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 #, fuzzy msgid "Search in All Repositories" msgstr "在所有的版本库中搜索" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "搜索短语" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "搜索范围" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "文件内容" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "提交信息" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "文件名" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "权限不足" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "已收集的统计： " -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "文件" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "" +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 +msgid "commits" +msgstr "提交" + +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "文件已添加" + #: kallithea/templates/summary/statistics.html:390 -msgid "commits" -msgstr "提交" +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" +msgstr "文件已更改" #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "文件已添加" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" -msgstr "文件已更改" - -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/tests/data/templates/summary/statistics.html.py:153 msgid "files removed" msgstr "文件已删除" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:393 +#: kallithea/tests/data/templates/summary/statistics.html.py:155 msgid "commit" msgstr "提交" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 msgid "file added" msgstr "文件已添加" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:395 +#: kallithea/tests/data/templates/summary/statistics.html.py:159 msgid "file changed" msgstr "文件已更改" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:396 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "文件已删除" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "%s概要" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "版本库由%s锁定" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "版本库未锁定" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "复刻自" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "克隆自" -#: kallithea/templates/summary/summary.html:72 -#, fuzzy -msgid "Clone URL" -msgstr "克隆地址" - -#: kallithea/templates/summary/summary.html:78 -msgid "Show by Name" -msgstr "以名字显示" - -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 msgid "Show by ID" msgstr "按ID显示" -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:72 +#: kallithea/tests/data/templates/summary/summary.html.py:143 +msgid "Show by Name" +msgstr "以名字显示" + +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "文件趋势图" +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 +msgid "Download" +msgstr "下载" + +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 +msgid "There are no downloads yet" +msgstr "无下载" + +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 +msgid "Downloads are disabled for this repository" +msgstr "这个版本库的下载已经禁用" + #: kallithea/templates/summary/summary.html:108 -msgid "Download" -msgstr "下载" +#: kallithea/tests/data/templates/summary/summary.html.py:190 +msgid "Download as zip" +msgstr "zip打包下载" #: kallithea/templates/summary/summary.html:112 -msgid "There are no downloads yet" -msgstr "无下载" +#: kallithea/tests/data/templates/summary/summary.html.py:194 +msgid "Check this to download archive with subrepos" +msgstr "勾选以下载包含子版本库的压缩包" #: kallithea/templates/summary/summary.html:114 -msgid "Downloads are disabled for this repository" -msgstr "这个版本库的下载已经禁用" - -#: kallithea/templates/summary/summary.html:120 -msgid "Download as zip" -msgstr "zip打包下载" - -#: kallithea/templates/summary/summary.html:125 -msgid "Check this to download archive with subrepos" -msgstr "勾选以下载包含子版本库的压缩包" - -#: kallithea/templates/summary/summary.html:125 +#: kallithea/tests/data/templates/summary/summary.html.py:196 #, fuzzy msgid "With subrepos" msgstr "包括子版本库" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 #, fuzzy msgid "Latest Changes" msgstr "文件已更改" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 #, fuzzy msgid "Quick Start" msgstr "快速入门" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "下载%s为%s包" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "%s标签" - -#: kallithea/templates/tags/tags.html:26 -#, fuzzy -msgid "Compare Tags" -msgstr "比较标签" - -#~ msgid "increase diff context to %(num)s lines" -#~ msgstr "" +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "控制面板" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "记住密码" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "修改你的头像" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "使用" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "网络" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "" +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." +"\n" +" The following " +"variables are available:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "" +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "快速过滤..." + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "忘记密码？" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +#, fuzzy +msgid "The comment closed the pull request with status" +msgstr "[评论]拉取请求" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +msgid "The comment was made with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "查看用户" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" +msgstr "" #~ msgid "No comments." #~ msgstr "%d条评论" @@ -6089,27 +6901,6 @@ #~ msgid "journal" #~ msgstr "日志" -#~ msgid "bad captcha" -#~ msgstr "" - -#~ msgid "forever" -#~ msgstr "" - -#~ msgid "unmodified" -#~ msgstr "" - -#~ msgid "Locked repository" -#~ msgstr "" - -#~ msgid "Unlocked repository" -#~ msgstr "" - -#~ msgid "Unlocked" -#~ msgstr "" - -#~ msgid "Locked" -#~ msgstr "" - #~ msgid "Repository has been %s" #~ msgstr "版本库已被%s" @@ -6119,14 +6910,6 @@ #~ msgid "No Files" #~ msgstr "没有文件" -#~ msgid "" -#~ "_: \n" -#~ "" -#~ msgstr "" - -#~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" -#~ msgstr "" - #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "不允许用户名 \"%(username)s\"" @@ -6142,69 +6925,24 @@ #~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" #~ msgstr "无效的克隆地址，提供一个有效的克隆 http(s)或svn+http(s)地址" -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" +#~ msgid "" #~ msgstr "修订%(revs)s已经包含在拉取请求中或者或者已经设置状态" #~ msgid "Defaults" #~ msgstr "默认设置" -#~ msgid "never" -#~ msgstr "" - -#~ msgid "My Emails" -#~ msgstr "" - #~ msgid "Watched" #~ msgstr "关注的" #~ msgid "My Permissions" #~ msgstr "我的权限" -#~ msgid "expires" -#~ msgstr "" - -#~ msgid "Confirm to reset this api key: %s" -#~ msgstr "" - -#~ msgid "reset" -#~ msgstr "" - -#~ msgid "expired" -#~ msgstr "" - -#~ msgid "Confirm to remove this api key: %s" -#~ msgstr "" - -#~ msgid "remove" -#~ msgstr "" - -#~ msgid "No additional api keys specified" -#~ msgstr "" - -#~ msgid "New api key" -#~ msgstr "" - #~ msgid "delete" #~ msgstr "删除" -#~ msgid "current IP" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "权限管理" -#~ msgid "Overview" -#~ msgstr "" - -#~ msgid "Overwrite existing settings" -#~ msgstr "" - -#~ msgid "Default IP Whitelist for All Users" -#~ msgstr "" - -#~ msgid "Confirm to delete this ip: %s" -#~ msgstr "" - #~ msgid "Default User Permissions Overview" #~ msgstr "默认权限" @@ -6220,15 +6958,6 @@ #~ msgid "admin" #~ msgstr "管理" -#~ msgid "user/user group" -#~ msgstr "" - -#~ msgid "delegated admin" -#~ msgstr "" - -#~ msgid "Import existing repository ?" -#~ msgstr "" - #~ msgid "Optional URL from which repository should be cloned." #~ msgstr "可选的，指定版本库应该从哪个http[s]地址克隆。" @@ -6238,139 +6967,254 @@ #~ msgid "Pull Changes from Remote Location" #~ msgstr "从远程路径拉取修订集" -#~ msgid "This repository does not have a remote URL set." -#~ msgstr "" - -#~ msgid "Non-changeable id" -#~ msgstr "" - #~ msgid "edit" #~ msgstr "编辑" -#~ msgid "new value" -#~ msgstr "" - -#~ msgid "URL used for doing remote pulls." -#~ msgstr "" - -#~ msgid "Email prefix" -#~ msgstr "" - -#~ msgid "Kallithea email from" -#~ msgstr "" - -#~ msgid "Error email from" -#~ msgstr "" - -#~ msgid "Error email recipients" -#~ msgstr "" - -#~ msgid "SMTP server" -#~ msgstr "" - -#~ msgid "SMTP username" -#~ msgstr "" - -#~ msgid "SMTP password" -#~ msgstr "" - -#~ msgid "SMTP port" -#~ msgstr "" - -#~ msgid "SMTP use TLS" -#~ msgstr "" - -#~ msgid "SMTP use SSL" -#~ msgstr "" - -#~ msgid "SMTP auth" -#~ msgstr "" - -#~ msgid "Destroy old data" -#~ msgstr "" - -#~ msgid "check for updates" -#~ msgstr "" - #~ msgid "Default permissions" #~ msgstr "默认权限" -#~ msgid "user groups" -#~ msgstr "" - -#~ msgid "Inherit from defaults" -#~ msgstr "" - -#~ msgid "show" -#~ msgstr "" - -#~ msgid "parent rev." -#~ msgstr "" - -#~ msgid "child rev." -#~ msgstr "" - -#~ msgid "no revisions" -#~ msgstr "" - #~ msgid "Status change from pull request" #~ msgstr "状态修改为%s" -#~ msgid "Status change on changeset" -#~ msgstr "" - -#~ msgid "Comment on changeset" -#~ msgstr "" - -#~ msgid "revision" -#~ msgstr "" - #~ msgid "Mimetype" #~ msgstr "MIME类型" #~ msgid "My Repos" #~ msgstr "我的版本库" -#~ msgid "Latest vote: %s" -#~ msgstr "" - -#~ msgid "Nobody voted" -#~ msgstr "" - -#~ msgid "%s Pull Request #%s" -#~ msgstr "" - -#~ msgid "Pull request #%s from %s#%s" -#~ msgstr "" - #~ msgid "owner" #~ msgstr "所有者" -#~ msgid "Your new password" -#~ msgstr "" - -#~ msgid "Your new Kallithea password:%s" -#~ msgstr "" - #~ msgid "Open New Pull Request for Selected Changesets" #~ msgstr "为选择的变更集创建新的拉取请求" -#~ msgid "Show Selected Changesets __S → __E" -#~ msgstr "" - #~ msgid "You can generate it by clicking following URL" #~ msgstr "点击下面的链接以重新生成密码：" -#~ msgid "Please ignore this email if you did not request a new password ." -#~ msgstr "" - #~ msgid "Created by" #~ msgstr "创建于" -#~ msgid "You can only delete files with revision being a valid branch " +#~ msgid "Ancestor didn't change - show diff since previous version:" +#~ msgstr "" + +#~ msgid "" +#~ "This pull request is based on " +#~ "another %s revision and there is " +#~ "no simple diff." +#~ msgstr "" + +#~ msgid "No changes found on %s %s since previous version." +#~ msgstr "" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "已关闭，被 %s 替换。" + +#~ msgid "The following changes are available on %s:" +#~ msgstr "" + +#~ msgid "Git pull requests don't support updates yet." +#~ msgstr "" + +#~ msgid "Closing." +#~ msgstr "关闭。" + +#~ msgid "An error occurred during creation of field" +#~ msgstr "" + +#~ msgid "Changeset not found" +#~ msgstr "未找到修订集" + +#~ msgid "Repository no access" +#~ msgstr "无版本库访问权限" + +#~ msgid "Repository read access" +#~ msgstr "版本库读取权限" + +#~ msgid "Repository write access" +#~ msgstr "版本库写入权限" + +#~ msgid "Repository admin access" +#~ msgstr "版本库管理权限" + +#~ msgid "Repository Group no access" +#~ msgstr "无版本库组访问权限" + +#~ msgid "Repository Group read access" +#~ msgstr "版本库组读取权限" + +#~ msgid "Repository Group write access" +#~ msgstr "版本库组写入" + +#~ msgid "Repository Group admin access" +#~ msgstr "版本库组管理权限" + +#~ msgid "Repository creation disabled" +#~ msgstr "禁用创建版本库" + +#~ msgid "Repository creation enabled" +#~ msgstr "允许创建版本库" + +#~ msgid "Repository forking disabled" +#~ msgstr "禁用复刻版本库" + +#~ msgid "Repository forking enabled" +#~ msgstr "允许复刻版本库" + +#~ msgid "Register disabled" +#~ msgstr "禁用注册" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "用手动激活注册新用户" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "用自动激活注册新用户" + +#~ msgid "Not Reviewed" +#~ msgstr "未检视" + +#~ msgid "Rejected" +#~ msgstr "驳回" + +#~ msgid "Under Review" +#~ msgstr "检视中" + +#~ msgid "Repository group no access" +#~ msgstr "" + +#~ msgid "Repository group read access" +#~ msgstr "" + +#~ msgid "Repository group write access" +#~ msgstr "" + +#~ msgid "Repository group admin access" +#~ msgstr "" + +#~ msgid "User group no access" +#~ msgstr "" + +#~ msgid "User group read access" +#~ msgstr "" + +#~ msgid "User group write access" +#~ msgstr "" + +#~ msgid "User group admin access" +#~ msgstr "" + +#~ msgid "Repository Group creation disabled" #~ msgstr "" -#~ msgid "You can only edit files with revision being a valid branch " +#~ msgid "Repository Group creation enabled" +#~ msgstr "" + +#~ msgid "User Group creation disabled" +#~ msgstr "" + +#~ msgid "User Group creation enabled" +#~ msgstr "" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "[评论]拉取请求" + +#~ msgid "No repositories found." +#~ msgstr "" + +#~ msgid "There are no branches yet" +#~ msgstr "没有任何分支" + +#~ msgid "There are no tags yet" +#~ msgstr "没有任何标签" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "无书签" + +#~ msgid "Analytics HTML block" +#~ msgstr "" + +#~ msgid "" +#~ "HTML with JavaScript for web analytics" +#~ " systems like Google Analytics or " +#~ "Piwik. This will be added at the" +#~ " bottom of every page." +#~ msgstr "" + +#~ msgid "" +#~ "Schema of clone URL construction eg. " +#~ "'{scheme}://{user}@{netloc}/{repo}'.\n" +#~ " The " +#~ "following variables are available:\n" +#~ " {scheme}" +#~ " 'http' or 'https' sent from running" +#~ " Kallithea server,\n" +#~ " {user}" +#~ " current user username,\n" +#~ " {netloc}" +#~ " network location/server host of running" +#~ " Kallithea server,\n" +#~ " {repo}" +#~ " full repository name,\n" +#~ " {repoid}" +#~ " ID of repository, can be used " +#~ "to contruct clone-by-id" +#~ msgstr "" + +#~ msgid "enabled" +#~ msgstr "" + +#~ msgid "disabled" +#~ msgstr "" + +#~ msgid "%s Bookmarks" +#~ msgstr "%s书签" + +#~ msgid "Compare Bookmarks" +#~ msgstr "" + +#~ msgid "%s Branches" +#~ msgstr "%s分支" + +#~ msgid "Compare Branches" +#~ msgstr "" + +#~ msgid "Editing file" +#~ msgstr "编辑文件" + +#~ msgid "Update" +#~ msgstr "[更新]用户" + +#~ msgid "" +#~ "Pull requests do not change once " +#~ "created. Select a revision and save " +#~ "to replace this pull request with " +#~ "a new one." +#~ msgstr "" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "新建拉取请求" + +#~ msgid "%s Tags" +#~ msgstr "%s标签" + +#~ msgid "Compare Tags" +#~ msgstr "比较标签" + +#~ msgid "" +#~ "Changing status on a changeset " +#~ "associated with a closed pull request" +#~ " is not allowed" +#~ msgstr "" + +#~ msgid "You have successfully registered into Kallithea" #~ msgstr "" #~ msgid "This pull request can be updated with changes on %s:" @@ -6379,6 +7223,14 @@ #~ msgid "Confirm to invalidate repository cache." #~ msgstr "确认清除版本库缓存" +#~ msgid "" +#~ "Changeset status: %s\n" +#~ "Click to open associated pull request %s" +#~ msgstr "" + +#~ msgid "Commenting on line {1}." +#~ msgstr "在{1}行上评论" + #~ msgid "Comments parsed using %s syntax with %s support." #~ msgstr "评论使用%s语法并支持%s" @@ -6391,10 +7243,15 @@ #~ msgid "Preview" #~ msgstr "" +#~ msgid "Use @username inside this text to notify another user." +#~ msgstr "在文本中使用 @用户名 以发送通知到该Kallithea用户" + #~ msgid "New file mode" #~ msgstr "" -#~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request %s" -#~ msgstr "" +#~ msgid "File is too big to display" +#~ msgstr "文件过大，不能显示" + +#~ msgid "Save as New Pull Request" +#~ msgstr "新建拉取请求" + diff -r a48802bf7134 -r 880e2f07651b kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Thu Jul 27 03:02:37 2017 +0200 +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Thu Jul 27 14:26:14 2017 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2016-03-14 16:51+0100\n" +"POT-Creation-Date: 2017-07-27 13:13+0200\n" "PO-Revision-Date: 2017-03-10 18:26+0000\n" "Last-Translator: mao \n" "Language-Team: Chinese (Traditional) " @@ -20,445 +20,478 @@ "X-Generator: Weblate 2.12\n" "Generated-By: Babel 1.3\n" -#: kallithea/controllers/changelog.py:85 -#: kallithea/controllers/pullrequests.py:240 kallithea/lib/base.py:515 +#: kallithea/controllers/changelog.py:86 +#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 msgid "There are no changesets yet" msgstr "" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 +#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "無" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:198 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 msgid "(closed)" msgstr "（已關閉）" -#: kallithea/controllers/changeset.py:88 +#: kallithea/controllers/changeset.py:85 msgid "Show whitespace" msgstr "顯示空格" -#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 -#: kallithea/templates/files/diff_2way.html:55 +#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 +#: kallithea/templates/files/diff_2way.html:53 msgid "Ignore whitespace" msgstr "忽略空格" -#: kallithea/controllers/changeset.py:168 +#: kallithea/controllers/changeset.py:165 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "增加 diff 上下文至 %(num)s 行" -#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:97 -#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:744 +#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 +#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:67 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "Git 版本庫" + +#: kallithea/controllers/compare.py:73 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:240 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:242 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:262 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 msgid "No response" msgstr "未回應" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "您沒有權限瀏覽這個頁面" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "找不到這個資源" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "修改於版本庫 %s" - -#: kallithea/controllers/feed.py:56 -#, python-format -msgid "%s %s feed" -msgstr "" - -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/controllers/feed.py:80 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:332 +#: kallithea/tests/data/templates/changeset/changeset.html.py:347 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 msgid "Changeset was too big and was cut off..." msgstr "" -#: kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:84 #, python-format msgid "%s committed on %s" msgstr "%s 評論於 %s" -#: kallithea/controllers/files.py:92 -msgid "Click here to add new file" -msgstr "" +#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 +#, python-format +msgid "%s %s feed" +msgstr "" + +#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 +#, python-format +msgid "Changes on %s repository" +msgstr "修改於版本庫 %s" #: kallithea/controllers/files.py:93 +msgid "Click here to add new file" +msgstr "" + +#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:195 +#: kallithea/controllers/files.py:191 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:307 kallithea/controllers/files.py:367 -#: kallithea/controllers/files.py:434 +#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 +#: kallithea/controllers/files.py:424 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:319 +#: kallithea/controllers/files.py:309 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:330 +#: kallithea/controllers/files.py:320 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:352 +#: kallithea/controllers/files.py:342 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:356 kallithea/controllers/files.py:422 -#: kallithea/controllers/files.py:503 +#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 +#: kallithea/controllers/files.py:493 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:379 +#: kallithea/controllers/files.py:369 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:393 +#: kallithea/controllers/files.py:383 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:409 +#: kallithea/controllers/files.py:399 msgid "No changes" msgstr "沒有修改" -#: kallithea/controllers/files.py:418 kallithea/controllers/files.py:492 +#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 #, python-format msgid "Successfully committed to %s" msgstr "成功遞交至 %s" -#: kallithea/controllers/files.py:445 +#: kallithea/controllers/files.py:435 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:466 +#: kallithea/controllers/files.py:456 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:470 +#: kallithea/controllers/files.py:460 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:495 +#: kallithea/controllers/files.py:485 msgid "Location must be relative path and must not contain .. in path" msgstr "" +#: kallithea/controllers/files.py:517 +msgid "Downloads disabled" +msgstr "" + #: kallithea/controllers/files.py:528 -msgid "Downloads disabled" -msgstr "" - -#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "未知修訂 %s" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:530 msgid "Empty repository" msgstr "空的版本庫" -#: kallithea/controllers/files.py:543 +#: kallithea/controllers/files.py:532 msgid "Unknown archive type" msgstr "未知的存檔類型" -#: kallithea/controllers/files.py:773 +#: kallithea/controllers/files.py:755 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 msgid "Changesets" msgstr "變更" -#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175 -#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 +#: kallithea/model/scm.py:705 msgid "Branches" msgstr "分支" -#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 +#: kallithea/model/scm.py:716 msgid "Tags" msgstr "標籤" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:176 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:77 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:94 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:479 -#: kallithea/templates/base/base.html:653 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:452 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 +#: kallithea/tests/data/templates/base/base.html.py:122 +#: kallithea/tests/data/templates/base/base.html.py:243 +#: kallithea/tests/data/templates/base/base.html.py:325 +#: kallithea/tests/data/templates/base/base.html.py:654 +#: kallithea/tests/data/templates/base/base.html.py:690 msgid "Repositories" msgstr "版本庫" -#: kallithea/controllers/home.py:139 +#: kallithea/controllers/home.py:120 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 +#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16 +#: kallithea/controllers/home.py:126 msgid "Closed Branches" msgstr "" -#: kallithea/controllers/home.py:151 +#: kallithea/controllers/home.py:132 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:157 +#: kallithea/controllers/home.py:138 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "開放日誌" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:306 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:295 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/base/base.html.py:498 +#: kallithea/tests/data/templates/journal/journal.html.py:124 +#: kallithea/tests/data/templates/journal/journal.html.py:228 msgid "Journal" msgstr "日誌" -#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 +#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:150 +#: kallithea/controllers/login.py:148 +#, python-format msgid "You have successfully registered with %s" msgstr "" -#: kallithea/controllers/login.py:195 +#: kallithea/controllers/login.py:193 msgid "A password reset confirmation code has been sent" msgstr "密碼重設的確認碼已寄出" -#: kallithea/controllers/login.py:244 +#: kallithea/controllers/login.py:242 msgid "Invalid password reset token" msgstr "無效的密碼重設確認碼" -#: kallithea/controllers/login.py:249 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/login.py:247 +#: kallithea/controllers/admin/my_account.py:157 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:123 +#: kallithea/controllers/pullrequests.py:73 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:135 #, python-format msgid "%s (closed)" msgstr "" -#: kallithea/controllers/pullrequests.py:151 +#: kallithea/controllers/pullrequests.py:162 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 +#: kallithea/tests/data/templates/changeset/changeset.html.py:408 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:172 +#: kallithea/controllers/pullrequests.py:183 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:184 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:312 +#: kallithea/controllers/pullrequests.py:326 #, python-format msgid "Error creating pull request: %s" msgstr "" +#: kallithea/controllers/pullrequests.py:353 +#: kallithea/controllers/pullrequests.py:376 +msgid "Error occurred while creating pull request" +msgstr "" + #: kallithea/controllers/pullrequests.py:358 -#: kallithea/controllers/pullrequests.py:505 -msgid "No description" -msgstr "無描述" - -#: kallithea/controllers/pullrequests.py:365 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:368 -#: kallithea/controllers/pullrequests.py:455 -#: kallithea/controllers/pullrequests.py:512 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:371 -#: kallithea/controllers/pullrequests.py:458 -msgid "Error occurred while creating pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:403 -msgid "Missing changesets since the previous pull request:" +#: kallithea/controllers/pullrequests.py:381 +msgid "New pull request iteration created" msgstr "" #: kallithea/controllers/pullrequests.py:410 #, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:417 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:426 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:464 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:472 -msgid "Pull request update created" -msgstr "" - -#: kallithea/controllers/pullrequests.py:516 +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:414 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:430 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "無描述" + +#: kallithea/controllers/pullrequests.py:439 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:531 +#: kallithea/controllers/pullrequests.py:453 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:491 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:518 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:532 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:599 +#: kallithea/controllers/pullrequests.py:534 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:617 -#, python-format -msgid "The following changes are available on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:621 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:629 +#: kallithea/controllers/pullrequests.py:552 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:556 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:635 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:727 +#: kallithea/controllers/pullrequests.py:571 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:573 +#, python-format +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:598 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/pullrequests.py:665 msgid "No permission to change pull request status" msgstr "" -#: kallithea/controllers/pullrequests.py:738 +#: kallithea/controllers/pullrequests.py:676 #, fuzzy, python-format msgid "Successfully deleted pull request %s" msgstr "成功遞交至 %s" -#: kallithea/controllers/pullrequests.py:748 -msgid "Closing." -msgstr "關閉中。" - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "無效的查詢。請使用跳脫字元。" -#: kallithea/controllers/search.py:140 +#: kallithea/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "沒有任何索引可以搜尋。請執行 whoosh 建立索引" -#: kallithea/controllers/search.py:144 +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "" -#: kallithea/controllers/summary.py:181 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:173 +#: kallithea/templates/summary/summary.html:360 +#: kallithea/tests/data/templates/summary/summary.html.py:293 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:184 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:176 +#: kallithea/templates/summary/summary.html:88 +#: kallithea/tests/data/templates/summary/summary.html.py:161 msgid "Statistics are disabled for this repository" msgstr "這個版本庫的統計功能已停用" @@ -470,149 +503,153 @@ msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:284 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 msgid "Forever" msgstr "" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:253 msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 msgid "1 month" msgstr "" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:290 +#: kallithea/controllers/admin/my_account.py:238 +#: kallithea/controllers/admin/users.py:256 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:145 +#: kallithea/controllers/admin/gists.py:141 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:183 +#: kallithea/controllers/admin/gists.py:159 #, python-format msgid "Deleted gist %s" msgstr "" -#: kallithea/controllers/admin/gists.py:232 +#: kallithea/controllers/admin/gists.py:200 msgid "Unmodified" msgstr "未修改" -#: kallithea/controllers/admin/gists.py:261 +#: kallithea/controllers/admin/gists.py:229 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:266 +#: kallithea/controllers/admin/gists.py:234 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:269 +#: kallithea/controllers/admin/gists.py:237 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:119 msgid "Your account was updated successfully" msgstr "您的帳號已更新完成" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:201 +#: kallithea/controllers/admin/my_account.py:134 +#: kallithea/controllers/admin/users.py:183 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:168 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/my_account.py:209 +#: kallithea/controllers/admin/users.py:371 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/my_account.py:215 +#: kallithea/controllers/admin/users.py:377 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/my_account.py:224 +#: kallithea/controllers/admin/users.py:387 msgid "Removed email from user" msgstr "" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:307 +#: kallithea/controllers/admin/my_account.py:248 +#: kallithea/controllers/admin/users.py:273 msgid "API key successfully created" msgstr "" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:320 +#: kallithea/controllers/admin/my_account.py:257 +#: kallithea/controllers/admin/users.py:283 msgid "API key successfully reset" msgstr "" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:324 +#: kallithea/controllers/admin/my_account.py:261 +#: kallithea/controllers/admin/users.py:287 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "讀" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" -msgstr "寫" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +#: kallithea/tests/data/templates/base/perms_summary.html.py:63 +msgid "Read" +msgstr "讀" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +#: kallithea/tests/data/templates/base/perms_summary.html.py:69 +msgid "Write" +msgstr "寫" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -620,608 +657,640 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:336 -#: kallithea/templates/base/base.html:337 -#: kallithea/templates/base/base.html:343 -#: kallithea/templates/base/base.html:344 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:332 +#: kallithea/templates/base/base.html:333 #: kallithea/templates/base/perms_summary.html:17 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 +#: kallithea/tests/data/templates/admin/users/users.html.py:119 +#: kallithea/tests/data/templates/admin/users/users.html.py:143 +#: kallithea/tests/data/templates/base/base.html.py:550 +#: kallithea/tests/data/templates/base/base.html.py:554 +#: kallithea/tests/data/templates/base/base.html.py:562 +#: kallithea/tests/data/templates/base/base.html.py:564 +#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "管理" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "停用" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1705 -msgid "Manual activation of external account" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1706 -msgid "Automatic activation of external account" -msgstr "" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:43 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:121 +msgid "Disabled" +msgstr "停用" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 +msgid "Manual activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:42 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 +#: kallithea/tests/data/templates/base/root.html.py:119 msgid "Enabled" msgstr "啟用" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:187 +#: kallithea/controllers/admin/repo_groups.py:180 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:192 +#: kallithea/controllers/admin/repo_groups.py:185 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:249 +#: kallithea/controllers/admin/repo_groups.py:232 #, python-format msgid "Updated repository group %s" msgstr "" +#: kallithea/controllers/admin/repo_groups.py:248 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:258 +#, python-format +msgid "This group contains %s repositories and cannot be deleted" +msgstr "" + #: kallithea/controllers/admin/repo_groups.py:265 #, python-format -msgid "Error occurred during update of repository group %s" -msgstr "" - -#: kallithea/controllers/admin/repo_groups.py:283 -#, python-format -msgid "This group contains %s repositories and cannot be deleted" -msgstr "" - -#: kallithea/controllers/admin/repo_groups.py:290 -#, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:296 +#: kallithea/controllers/admin/repo_groups.py:271 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:301 +#: kallithea/controllers/admin/repo_groups.py:276 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:404 -#: kallithea/controllers/admin/repo_groups.py:439 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:361 +#: kallithea/controllers/admin/repo_groups.py:391 +#: kallithea/controllers/admin/user_groups.py:305 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:419 +#: kallithea/controllers/admin/repo_groups.py:376 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:456 -#: kallithea/controllers/admin/repos.py:397 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:408 +#: kallithea/controllers/admin/repos.py:362 +#: kallithea/controllers/admin/user_groups.py:317 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:151 +#: kallithea/controllers/admin/repos.py:138 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:212 +#: kallithea/controllers/admin/repos.py:198 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:221 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:224 +#: kallithea/controllers/admin/repos.py:210 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:261 +#: kallithea/controllers/admin/repos.py:239 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" -#: kallithea/controllers/admin/repos.py:282 +#: kallithea/controllers/admin/repos.py:260 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:309 +#: kallithea/controllers/admin/repos.py:278 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:312 +#: kallithea/controllers/admin/repos.py:281 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:317 +#: kallithea/controllers/admin/repos.py:286 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:320 +#: kallithea/controllers/admin/repos.py:289 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:325 +#: kallithea/controllers/admin/repos.py:294 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:373 +#: kallithea/controllers/admin/repos.py:338 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:429 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:443 +#: kallithea/controllers/admin/repos.py:391 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:394 +#, python-format +msgid "An error occurred during creation of field: %r" +msgstr "" + +#: kallithea/controllers/admin/repos.py:405 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:459 +#: kallithea/controllers/admin/repos.py:419 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:490 +#: kallithea/controllers/admin/repos.py:450 msgid "Updated repository visibility in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:454 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: kallithea/controllers/admin/repos.py:511 +#: kallithea/controllers/admin/repos.py:471 msgid "Nothing" msgstr "" -#: kallithea/controllers/admin/repos.py:513 +#: kallithea/controllers/admin/repos.py:473 #, python-format msgid "Marked repository %s as fork of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:520 +#: kallithea/controllers/admin/repos.py:480 msgid "An error occurred during this operation" msgstr "" -#: kallithea/controllers/admin/repos.py:536 -#: kallithea/controllers/admin/repos.py:563 +#: kallithea/controllers/admin/repos.py:496 +#: kallithea/controllers/admin/repos.py:517 msgid "Repository has been locked" msgstr "儲存所已被鎖定" -#: kallithea/controllers/admin/repos.py:539 -#: kallithea/controllers/admin/repos.py:560 +#: kallithea/controllers/admin/repos.py:499 +#: kallithea/controllers/admin/repos.py:514 msgid "Repository has been unlocked" msgstr "儲存所已打開" -#: kallithea/controllers/admin/repos.py:542 -#: kallithea/controllers/admin/repos.py:567 +#: kallithea/controllers/admin/repos.py:502 +#: kallithea/controllers/admin/repos.py:521 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:581 +#: kallithea/controllers/admin/repos.py:533 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:585 +#: kallithea/controllers/admin/repos.py:537 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:600 +#: kallithea/controllers/admin/repos.py:550 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:603 +#: kallithea/controllers/admin/repos.py:553 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:636 +#: kallithea/controllers/admin/repos.py:584 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:141 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:139 +#: kallithea/model/validators.py:426 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:151 -#: kallithea/controllers/admin/settings.py:248 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:187 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:244 +#: kallithea/controllers/admin/settings.py:189 +#, fuzzy, python-format +#| msgid "Invalidate Repository Cache" +msgid "Invalidated %s repositories" +msgstr "確認廢止版本庫快取" + +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "更新應用設定" -#: kallithea/controllers/admin/settings.py:301 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:306 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:332 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:347 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:378 +#: kallithea/controllers/admin/settings.py:356 msgid "Added new hook" msgstr "新增hook" -#: kallithea/controllers/admin/settings.py:392 +#: kallithea/controllers/admin/settings.py:370 msgid "Updated hooks" msgstr "更新hook" -#: kallithea/controllers/admin/settings.py:396 +#: kallithea/controllers/admin/settings.py:374 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:422 +#: kallithea/controllers/admin/settings.py:398 msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引工作排程" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:145 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:158 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:186 #, python-format msgid "Updated user group %s" msgstr "" +#: kallithea/controllers/admin/user_groups.py:208 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:219 +msgid "Successfully deleted user group" +msgstr "" + #: kallithea/controllers/admin/user_groups.py:224 -#, python-format -msgid "Error occurred during update of user group %s" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:242 -msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:284 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:290 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:383 +#: kallithea/controllers/admin/user_groups.py:401 +#: kallithea/controllers/admin/users.py:342 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/user_groups.py:405 +#: kallithea/controllers/admin/users.py:346 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:133 +#: kallithea/controllers/admin/users.py:125 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:148 +#: kallithea/controllers/admin/users.py:140 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:181 +#: kallithea/controllers/admin/users.py:164 msgid "User updated successfully" msgstr "使用者更新完成" -#: kallithea/controllers/admin/users.py:217 +#: kallithea/controllers/admin/users.py:192 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:222 +#: kallithea/controllers/admin/users.py:197 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:235 +#: kallithea/controllers/admin/users.py:205 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:462 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:468 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:482 +#: kallithea/controllers/admin/users.py:432 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:737 +#: kallithea/lib/auth.py:777 #, python-format msgid "IP %s not allowed" msgstr "" -#: kallithea/lib/auth.py:750 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/auth.py:768 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:813 +#: kallithea/lib/auth.py:829 msgid "You need to be a registered user to perform this action" msgstr "您必須是註冊使用者才能執行這個動作" -#: kallithea/lib/auth.py:843 +#: kallithea/lib/auth.py:857 msgid "You need to be signed in to view this page" msgstr "您必須登入後才能瀏覽這個頁面" -#: kallithea/lib/base.py:493 +#: kallithea/lib/base.py:449 +msgid "Invalid API key" +msgstr "" + +#: kallithea/lib/base.py:508 +msgid "CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:591 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:623 -msgid "Changeset not found" -msgstr "" - -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/base.py:617 +#, python-format +msgid "Changeset for %s %s not found in %s" +msgstr "" + +#: kallithea/lib/diffs.py:68 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:89 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:99 msgid "No changes detected" msgstr "尚未有任何變更" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:600 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:602 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:613 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "Changeset %s not found" +msgstr "尚未有任何變更" + +#: kallithea/lib/helpers.py:662 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:668 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:687 msgid "and" msgstr "和" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:688 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:132 msgid "revisions" msgstr "修訂" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:713 #, python-format msgid "Fork name %s" msgstr "分支名稱 %s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:734 #, python-format msgid "Pull request %s" msgstr "提取要求 %s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:744 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:748 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:754 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:756 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:764 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:766 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:768 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:770 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:772 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:774 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:776 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:778 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:780 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:782 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:784 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:786 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:788 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1124 +#: kallithea/lib/helpers.py:913 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1128 -#: kallithea/templates/compare/compare_diff.html:71 -#: kallithea/templates/pullrequests/pullrequest_show.html:337 +#: kallithea/lib/helpers.py:917 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:310 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1194 +#: kallithea/lib/helpers.py:942 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1197 +#: kallithea/lib/helpers.py:945 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1200 +#: kallithea/lib/helpers.py:948 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1203 +#: kallithea/lib/helpers.py:951 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1208 +#: kallithea/lib/helpers.py:956 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1469 +#: kallithea/lib/helpers.py:1230 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1229,1450 +1298,1136 @@ "repositories" msgstr "" -#: kallithea/lib/utils2.py:434 +#: kallithea/lib/utils2.py:387 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" -#: kallithea/lib/utils2.py:435 +#: kallithea/lib/utils2.py:388 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:389 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: kallithea/lib/utils2.py:437 +#: kallithea/lib/utils2.py:390 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:391 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: kallithea/lib/utils2.py:439 +#: kallithea/lib/utils2.py:392 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: kallithea/lib/utils2.py:455 +#: kallithea/lib/utils2.py:408 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:457 +#: kallithea/lib/utils2.py:410 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:459 +#: kallithea/lib/utils2.py:412 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:462 +#: kallithea/lib/utils2.py:415 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:465 +#: kallithea/lib/utils2.py:418 msgid "just now" msgstr "現在" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1669 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2237 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2238 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1518 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1701 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1695 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1696 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1574 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1715 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1717 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1672 +#: kallithea/model/db.py:1718 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1719 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1720 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1722 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1677 +#: kallithea/model/db.py:1723 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1724 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1725 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1727 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1682 +#: kallithea/model/db.py:1728 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1729 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1730 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1732 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1733 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1735 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1736 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1692 +#: kallithea/model/db.py:1738 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1693 +#: kallithea/model/db.py:1739 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1698 +#: kallithea/model/db.py:1741 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1742 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1744 msgid "Only admins can fork repositories" msgstr "祗有管理者才能分歧版本庫" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1745 #, fuzzy msgid "Non-admins can fork repositories" msgstr "建立版本庫" -#: kallithea/model/db.py:1702 +#: kallithea/model/db.py:1747 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1748 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1703 +#: kallithea/model/db.py:1749 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2236 +#: kallithea/model/db.py:2276 msgid "Not reviewed" msgstr "未審核" -#: kallithea/model/db.py:2239 +#: kallithea/model/db.py:2277 msgid "Under review" msgstr "審核中" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2278 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2279 +msgid "Approved" +msgstr "" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "請登入" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "請輸入密碼" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:165 +#: kallithea/model/forms.py:167 msgid "Name must not contain only digits" msgstr "" +#: kallithea/model/notification.py:240 +#, python-format +msgid "%(user)s commented on changeset %(age)s" +msgstr "" + +#: kallithea/model/notification.py:241 +#, python-format +msgid "%(user)s sent message %(age)s" +msgstr "" + +#: kallithea/model/notification.py:242 +#, python-format +msgid "%(user)s mentioned you %(age)s" +msgstr "" + +#: kallithea/model/notification.py:243 +#, python-format +msgid "%(user)s registered in Kallithea %(age)s" +msgstr "" + +#: kallithea/model/notification.py:244 +#, python-format +msgid "%(user)s opened new pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:245 +#, python-format +msgid "%(user)s commented on pull request %(age)s" +msgstr "" + +#: kallithea/model/notification.py:252 +#, python-format +msgid "%(user)s commented on changeset at %(when)s" +msgstr "" + +#: kallithea/model/notification.py:253 +#, python-format +msgid "%(user)s sent message at %(when)s" +msgstr "" + #: kallithea/model/notification.py:254 #, python-format -msgid "%(user)s commented on changeset %(age)s" +msgid "%(user)s mentioned you at %(when)s" msgstr "" #: kallithea/model/notification.py:255 #, python-format -msgid "%(user)s sent message %(age)s" +msgid "%(user)s registered in Kallithea at %(when)s" msgstr "" #: kallithea/model/notification.py:256 #, python-format -msgid "%(user)s mentioned you %(age)s" +msgid "%(user)s opened new pull request at %(when)s" msgstr "" #: kallithea/model/notification.py:257 #, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:266 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "" -#: kallithea/model/notification.py:302 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:305 +#: kallithea/model/notification.py:288 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" + +#: kallithea/model/notification.py:291 #, python-format msgid "New user %(new_username)s registered" msgstr "" +#: kallithea/model/notification.py:293 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:294 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + #: kallithea/model/notification.py:307 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:321 msgid "Closing" msgstr "關閉中" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:708 +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:697 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 msgid "You can't remove this user since it is crucial for the entire application" msgstr "您無法移除這個使用者，因為係供整個應用使用" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" " owners or remove those repository groups: %s" msgstr "" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:368 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:418 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:419 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:96 +#: kallithea/model/validators.py:73 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:98 +#: kallithea/model/validators.py:75 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:100 +#: kallithea/model/validators.py:77 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" msgstr "" -#: kallithea/model/validators.py:127 +#: kallithea/model/validators.py:104 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:111 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + +#: kallithea/model/validators.py:131 +msgid "Invalid user group name" +msgstr "" + +#: kallithea/model/validators.py:132 +#, python-format +msgid "User group \"%(usergroup)s\" already exists" +msgstr "" + #: kallithea/model/validators.py:134 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:154 -msgid "Invalid user group name" -msgstr "" - -#: kallithea/model/validators.py:155 -#, python-format -msgid "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:157 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "使用者羣組名稱可以包括文數字字元、底線、句點或破折號，必須以文數字啟頭" -#: kallithea/model/validators.py:197 +#: kallithea/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:198 +#: kallithea/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:200 +#: kallithea/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:258 +#: kallithea/model/validators.py:233 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:273 +#: kallithea/model/validators.py:248 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:289 +#: kallithea/model/validators.py:264 msgid "Passwords do not match" msgstr "密碼不相符" -#: kallithea/model/validators.py:304 +#: kallithea/model/validators.py:279 msgid "Invalid username or password" msgstr "無效的用戶名稱或密碼" -#: kallithea/model/validators.py:335 +#: kallithea/model/validators.py:310 msgid "Token mismatch" msgstr "" -#: kallithea/model/validators.py:351 +#: kallithea/model/validators.py:326 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:353 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:354 +#: kallithea/model/validators.py:329 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:356 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:470 +#: kallithea/model/validators.py:449 msgid "Invalid repository URL" msgstr "無效的版本庫 URL" -#: kallithea/model/validators.py:471 +#: kallithea/model/validators.py:450 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:496 +#: kallithea/model/validators.py:475 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:511 +#: kallithea/model/validators.py:490 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:513 +#: kallithea/model/validators.py:492 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:563 +#: kallithea/model/validators.py:542 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:604 +#: kallithea/model/validators.py:582 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:697 +#: kallithea/model/validators.py:675 msgid "This is not a valid path" msgstr "不是一個有效的路徑" -#: kallithea/model/validators.py:714 +#: kallithea/model/validators.py:692 #, fuzzy msgid "This email address is already in use" msgstr "這個郵件位址已經使用了" -#: kallithea/model/validators.py:734 +#: kallithea/model/validators.py:712 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:771 +#: kallithea/model/validators.py:749 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -#: kallithea/model/validators.py:783 +#: kallithea/model/validators.py:761 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:784 +#: kallithea/model/validators.py:762 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:817 +#: kallithea/model/validators.py:795 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:831 +#: kallithea/model/validators.py:809 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:847 +#: kallithea/model/validators.py:825 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "儀表板" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "快速過濾..." - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "個版本庫" - -#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/tests/data/templates/index_base.html.py:66 +#: kallithea/tests/data/templates/index_base.html.py:78 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 +#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/tests/data/templates/index_base.html.py:72 +#: kallithea/tests/data/templates/index_base.html.py:84 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 msgid "Add Repository Group" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:90 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 +#: kallithea/tests/data/templates/index_base.html.py:92 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/index_base.html:47 +#, fuzzy +#| msgid "Repository group" +msgid "Repository Group" +msgstr "版本庫群組" + +#: kallithea/templates/index_base.html:48 +#: kallithea/templates/index_base.html:90 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:36 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:58 +#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/index_base.html.py:100 +#: kallithea/tests/data/templates/index_base.html.py:130 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 +#: kallithea/tests/data/templates/summary/summary.html.py:147 msgid "Description" msgstr "描述" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "名稱" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:85 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/tests/data/templates/admin/admin_log.html.py:43 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 +msgid "Repository" +msgstr "版本庫" + +#: kallithea/templates/index_base.html:92 +#: kallithea/tests/data/templates/index_base.html.py:132 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/index_base.html:94 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/tests/data/templates/index_base.html.py:134 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:132 +#: kallithea/templates/index_base.html:95 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:244 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:135 +#: kallithea/templates/pullrequests/pullrequest_show.html:228 +#: kallithea/templates/summary/summary.html:123 +#: kallithea/tests/data/templates/index_base.html.py:136 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 +#: kallithea/tests/data/templates/summary/summary.html.py:199 msgid "Owner" msgstr "擁有者" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:414 +#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 +#: kallithea/templates/base/base.html:393 +#: kallithea/tests/data/templates/login.html.py:64 +#: kallithea/tests/data/templates/login.html.py:106 +#: kallithea/tests/data/templates/base/base.html.py:626 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:12 +#: kallithea/tests/data/templates/login.html.py:60 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:377 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/pullrequests/pullrequest_show.html:142 +#: kallithea/tests/data/templates/login.html.py:69 +#: kallithea/tests/data/templates/register.html.py:69 +#: kallithea/tests/data/templates/admin/admin_log.html.py:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 +#: kallithea/tests/data/templates/admin/users/users.html.py:109 +#: kallithea/tests/data/templates/base/base.html.py:611 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 msgid "Username" msgstr "帳號" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:399 +#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:381 +#: kallithea/tests/data/templates/login.html.py:73 +#: kallithea/tests/data/templates/register.html.py:73 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 +#: kallithea/tests/data/templates/base/base.html.py:615 msgid "Password" msgstr "密碼" -#: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +#: kallithea/templates/login.html:39 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:46 +#: kallithea/tests/data/templates/login.html.py:79 msgid "Forgot your password ?" msgstr "忘記您的密碼?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 +#: kallithea/templates/login.html:49 +#: kallithea/tests/data/templates/login.html.py:83 +#: kallithea/tests/data/templates/base/base.html.py:623 msgid "Don't have an account ?" msgstr "沒有帳號?" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:52 +#: kallithea/tests/data/templates/login.html.py:86 msgid "Sign In" msgstr "登入" #: kallithea/templates/password_reset.html:5 +#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset_confirmation.html:13 +#: kallithea/tests/data/templates/password_reset.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 #, fuzzy, python-format msgid "Reset Your Password to %s" msgstr "" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:15 +#: kallithea/tests/data/templates/password_reset.html.py:64 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 #, fuzzy msgid "Reset Your Password" msgstr "忘記您的密碼?" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:21 +#: kallithea/tests/data/templates/password_reset.html.py:69 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:29 +#: kallithea/templates/register.html:65 +#: kallithea/tests/data/templates/password_reset.html.py:75 +#: kallithea/tests/data/templates/register.html.py:95 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:39 +#: kallithea/tests/data/templates/password_reset.html.py:80 msgid "Send Password Reset Email" msgstr "" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:44 +#: kallithea/tests/data/templates/password_reset.html.py:82 #, fuzzy msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "密碼重設連結已郵寄至您的信箱" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:21 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:26 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:33 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 #, fuzzy msgid "New Password" msgstr "新密碼" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:40 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 #, fuzzy msgid "Confirm New Password" msgstr "新密碼" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:49 +#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 +#: kallithea/templates/register.html:75 +#: kallithea/tests/data/templates/register.html.py:64 +#: kallithea/tests/data/templates/register.html.py:100 +#: kallithea/tests/data/templates/register.html.py:137 msgid "Sign Up" msgstr "登入" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:13 +#: kallithea/tests/data/templates/register.html.py:60 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:36 +#: kallithea/tests/data/templates/register.html.py:77 msgid "Re-enter password" msgstr "確認密碼" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/register.html:43 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/tests/data/templates/register.html.py:81 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 +#: kallithea/tests/data/templates/admin/users/users.html.py:111 msgid "First Name" msgstr "名" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/register.html:50 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/tests/data/templates/register.html.py:85 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 +#: kallithea/tests/data/templates/admin/users/users.html.py:113 msgid "Last Name" msgstr "姓" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/register.html:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/tests/data/templates/register.html.py:89 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 msgid "Email" msgstr "電子郵件" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:77 +#: kallithea/tests/data/templates/register.html.py:104 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:79 +#: kallithea/tests/data/templates/register.html.py:108 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "沒有任何分支" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "沒有任何標籤" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 +#: kallithea/tests/data/templates/admin/admin.html.py:133 +#: kallithea/tests/data/templates/admin/admin.html.py:155 +#: kallithea/tests/data/templates/base/base.html.py:239 #, fuzzy msgid "Admin Journal" msgstr "管理員日誌" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 +#: kallithea/tests/data/templates/admin/admin.html.py:131 +#: kallithea/tests/data/templates/journal/journal.html.py:122 #, fuzzy msgid "Filter" msgstr "檔案" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 +#: kallithea/tests/data/templates/admin/admin.html.py:135 +#: kallithea/tests/data/templates/journal/journal.html.py:126 #, fuzzy, python-format msgid "%s Entry" msgid_plural "%s Entries" msgstr[0] "" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +#: kallithea/tests/data/templates/admin/admin_log.html.py:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 +#: kallithea/tests/data/templates/admin/users/users.html.py:123 msgid "Action" msgstr "動作" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "版本庫" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:45 msgid "Date" msgstr "時間" #: kallithea/templates/admin/admin_log.html:9 +#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "來源IP" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 +#: kallithea/tests/data/templates/admin/admin_log.html.py:84 msgid "No actions yet" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:5 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 +#: kallithea/tests/data/templates/base/base.html.py:263 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:94 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:104 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 msgid "Save" msgstr "儲存" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 +#: kallithea/tests/data/templates/base/base.html.py:267 #, fuzzy msgid "Repository Defaults" msgstr "個版本庫" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 msgid "Type" msgstr "類型" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/data_table/_dt_elements.html:18 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 msgid "Private repository" msgstr "私有的版本庫" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:63 +#: kallithea/templates/forks/fork.html:61 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 msgid "Enable statistics" msgstr "啟用統計" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:70 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 msgid "Enable statistics window on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 msgid "Enable downloads" msgstr "啟用下載" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:77 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 msgid "Enable download menu on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 msgid "Enable locking" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2681,321 +2436,474 @@ msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " "%(here)s to reload new version." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +#: kallithea/tests/data/templates/admin/gists/new.html.py:203 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +#: kallithea/tests/data/templates/admin/gists/new.html.py:205 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +#: kallithea/tests/data/templates/admin/gists/index.html.py:137 +#: kallithea/tests/data/templates/admin/gists/index.html.py:143 +#: kallithea/tests/data/templates/admin/gists/show.html.py:131 +#: kallithea/tests/data/templates/admin/gists/show.html.py:137 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/tests/data/templates/admin/gists/index.html.py:139 +#: kallithea/tests/data/templates/admin/gists/show.html.py:133 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 #, fuzzy msgid "Never" msgstr "擁有者" -#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:147 -#: kallithea/templates/changeset/changeset_file_comment.html:105 +#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 msgid "Cancel" msgstr "" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 +#: kallithea/tests/data/templates/admin/gists/index.html.py:178 +#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, python-format msgid "Private Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 +#: kallithea/tests/data/templates/admin/gists/index.html.py:182 +#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, python-format msgid "Public Gists for User %s" msgstr "" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 +#: kallithea/tests/data/templates/admin/gists/index.html.py:186 +#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:321 +#: kallithea/templates/base/base.html:310 +#: kallithea/tests/data/templates/admin/gists/index.html.py:115 +#: kallithea/tests/data/templates/admin/gists/show.html.py:115 +#: kallithea/tests/data/templates/base/base.html.py:521 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:88 +#: kallithea/tests/data/templates/admin/gists/index.html.py:131 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 +#: kallithea/tests/data/templates/admin/gists/index.html.py:155 msgid "There are no gists yet" msgstr "" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 +#: kallithea/tests/data/templates/admin/gists/new.html.py:127 +#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +#: kallithea/tests/data/templates/admin/gists/new.html.py:211 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 +#: kallithea/tests/data/templates/admin/gists/new.html.py:213 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:105 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/tests/data/templates/admin/gists/new.html.py:215 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 +#: kallithea/tests/data/templates/files/files_add.html.py:249 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 msgid "Reset" msgstr "重設" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 +#: kallithea/tests/data/templates/admin/gists/show.html.py:201 +#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 +#: kallithea/tests/data/templates/admin/gists/show.html.py:205 +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +#: kallithea/tests/data/templates/admin/gists/show.html.py:120 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/tests/data/templates/admin/gists/show.html.py:124 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/templates/changeset/changeset_file_comment.html:31 -#: kallithea/templates/changeset/changeset_file_comment.html:95 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/notifications/notifications_data.html:14 +#: kallithea/templates/admin/notifications/show_notification.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#: kallithea/templates/data_table/_dt_elements.html:76 +#: kallithea/templates/data_table/_dt_elements.html:104 +#: kallithea/templates/data_table/_dt_elements.html:119 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 +#: kallithea/tests/data/templates/files/files_source.html.py:82 +#: kallithea/tests/data/templates/files/files_source.html.py:88 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "移除" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/tests/data/templates/admin/gists/show.html.py:146 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:70 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:112 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:127 +#: kallithea/templates/data_table/_dt_elements.html:128 +#: kallithea/templates/files/diff_2way.html:54 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +#: kallithea/tests/data/templates/admin/gists/show.html.py:153 +#: kallithea/tests/data/templates/base/perms_summary.html.py:105 +#: kallithea/tests/data/templates/base/perms_summary.html.py:154 +#: kallithea/tests/data/templates/base/perms_summary.html.py:160 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +#: kallithea/tests/data/templates/admin/gists/show.html.py:156 +#: kallithea/tests/data/templates/files/files_source.html.py:73 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 +#: kallithea/tests/data/templates/admin/gists/show.html.py:164 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 +#: kallithea/templates/admin/gists/show.html:82 +#: kallithea/tests/data/templates/admin/gists/show.html.py:178 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:431 +#: kallithea/templates/base/base.html:404 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 +#: kallithea/tests/data/templates/base/base.html.py:644 msgid "My Account" msgstr "我的帳號" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 #, fuzzy msgid "Owned Repositories" msgstr "個版本庫" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 +#: kallithea/tests/data/templates/journal/journal.html.py:196 #, fuzzy msgid "Watched Repositories" msgstr "建立版本庫" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 +#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 #, fuzzy msgid "Show Permissions" msgstr "權限" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 #, python-format msgid "Confirm to reset this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 #, fuzzy, python-format msgid "Confirm to remove this API key: %s" msgstr "確認移除目前的統計" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 #, fuzzy msgid "Remove" msgstr "移除檔案" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 +#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 msgid "Add" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 msgid "New email address" msgstr "" @@ -3004,284 +2912,365 @@ msgid "Change Your Account Password" msgstr "忘記您的密碼?" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 msgid "New password" msgstr "新密碼" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, fuzzy, python-format +#| msgid "Change your avatar at" +msgid "Change %s avatar at" msgstr "修改您的頭像於" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "使用中" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 #, fuzzy msgid "Repositories You Own" msgstr "個版本庫" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "" +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: kallithea/templates/admin/repos/repos.html:38 +#: kallithea/templates/admin/user_groups/user_groups.html:38 +#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/files/files_browser.html:62 +#: kallithea/tests/data/templates/index_base.html.py:128 +#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 +#: kallithea/tests/data/templates/base/perms_summary.html.py:111 +#: kallithea/tests/data/templates/files/files_browser.html.py:76 +msgid "Name" +msgstr "名稱" #: kallithea/templates/admin/my_account/my_account_watched.html:1 +#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 #, fuzzy msgid "Repositories You are Watching" msgstr "版本庫路徑" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:24 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:25 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:180 +#: kallithea/templates/base/base.html:175 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 +#: kallithea/tests/data/templates/base/base.html.py:432 msgid "Pull Requests" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:30 +#: kallithea/templates/admin/notifications/notifications.html:29 +#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 msgid "Mark All Read" msgstr "" -#: kallithea/templates/admin/notifications/notifications_data.html:40 +#: kallithea/templates/admin/notifications/notifications_data.html:12 +msgid "Mark as read" +msgstr "" + +#: kallithea/templates/admin/notifications/notifications_data.html:21 +#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 msgid "No notifications here yet" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 msgid "Show Notification" msgstr "" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:430 +#: kallithea/templates/base/base.html:403 +#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 +#: kallithea/tests/data/templates/base/base.html.py:640 msgid "Notifications" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 +#: kallithea/tests/data/templates/base/base.html.py:259 #, fuzzy msgid "Default Permissions" msgstr "預設權限" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 msgid "Anonymous access" msgstr "訪客權限" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:9 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 #, fuzzy msgid "Apply to all existing repositories" msgstr "建立版本庫" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 msgid "Permissions for the Default user on new repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:147 +#: kallithea/templates/forks/fork.html:42 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 msgid "Repository group" msgstr "版本庫群組" -#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/admin/permissions/permissions_globals.html:31 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 msgid "Apply to all existing repository groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/data_table/_dt_elements.html:154 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:44 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:52 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 #, fuzzy msgid "Top level repository creation" msgstr "版本庫建立" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 +#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 msgid "Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:63 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:67 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:77 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:81 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 msgid "Registration" msgstr "註冊" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:87 +#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 #, fuzzy, python-format msgid "Confirm to delete this IP address: %s" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 +#: kallithea/tests/data/templates/base/base.html.py:247 +#: kallithea/tests/data/templates/base/base.html.py:696 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 msgid "Group name" msgstr "群組名稱" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 msgid "Group parent" msgstr "父群組" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 msgid "Copy permission set from parent repository group." msgstr "" @@ -3290,31 +3279,42 @@ msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 +#: kallithea/tests/data/templates/base/base.html.py:271 +#: kallithea/tests/data/templates/base/base.html.py:377 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 msgid "Settings" msgstr "設定" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "權限" @@ -3338,12 +3338,14 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:129 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:135 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3353,16 +3355,36 @@ msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "Disabled" +msgid "Visible" +msgstr "停用" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "No response" +msgid "Add repos" +msgstr "未回應" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy @@ -3371,105 +3393,117 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 #, fuzzy msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" +#, fuzzy, python-format +#| msgid "Repository group" +msgid "Repository group %s" +msgstr "版本庫群組" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "首頁" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 #, fuzzy msgid "Repository Groups Administration" msgstr "版本庫管理員" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 #, fuzzy msgid "Number of Top-level Repositories" msgstr "建立版本庫" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 #, fuzzy msgid "Clone remote repository" msgstr "私有版本庫" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:55 +#: kallithea/templates/forks/fork.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3498,99 +3532,120 @@ msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, fuzzy, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 msgid "Remote" msgstr "遠端" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:160 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 +#: kallithea/tests/data/templates/summary/statistics.html.py:217 +#: kallithea/tests/data/templates/summary/summary.html.py:245 +#: kallithea/tests/data/templates/summary/summary.html.py:249 msgid "Statistics" msgstr "統計" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 #, fuzzy msgid "Parent" msgstr "父群組" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 #, fuzzy msgid "Public Journal Visibility" msgstr "公開日誌" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 msgid "Remove from public journal" msgstr "從公開日誌移除" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 #, fuzzy msgid "Add to Public Journal" msgstr "公開日誌" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 #, fuzzy msgid "Change Locking" msgstr "修改紀錄" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 #, fuzzy msgid "Confirm to unlock repository." msgstr "確認廢止版本庫快取" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 #, fuzzy msgid "Unlock Repository" msgstr "公開的版本庫" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 #, python-format msgid "Locked by %s on %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 #, fuzzy msgid "Confirm to lock repository." msgstr "確認廢止版本庫快取" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 #, fuzzy msgid "Lock Repository" msgstr "公開的版本庫" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3598,32 +3653,39 @@ "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 #, fuzzy msgid "Delete this Repository" msgstr "公開的版本庫" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 #, fuzzy, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3635,106 +3697,116 @@ msgid "Invalidate Repository Cache" msgstr "確認廢止版本庫快取" -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 +#: kallithea/tests/data/templates/admin/users/users.html.py:117 msgid "Active" msgstr "啟用" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "私有版本庫" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "Go to tip of repository" +msgid "Fork of repository" +msgstr "Git 版本庫" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "私有版本庫" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 #, fuzzy msgid "Pull Changes from Remote Repository" msgstr "修改於版本庫 %s" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 #, fuzzy msgid "Confirm to pull changes from remote repository." msgstr "確認廢止版本庫快取" -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 #, fuzzy msgid "Permanent Repository ID" msgstr "私有版本庫" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3744,35 +3816,35 @@ "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "私有版本庫" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 #, fuzzy msgid "Repository URL" msgstr "版本庫" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:46 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3787,318 +3859,379 @@ msgstr "確認移除目前的統計" #: kallithea/templates/admin/repos/repos.html:5 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 #, fuzzy msgid "Repositories Administration" msgstr "版本庫管理員" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 +#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 msgid "State" msgstr "" #: kallithea/templates/admin/settings/settings.html:5 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 #, fuzzy msgid "Settings Administration" msgstr "設定管理員" #: kallithea/templates/admin/settings/settings.html:27 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "" #: kallithea/templates/admin/settings/settings.html:28 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "" #: kallithea/templates/admin/settings/settings.html:30 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 msgid "Hooks" msgstr "" #: kallithea/templates/admin/settings/settings.html:33 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "" #: kallithea/templates/admin/settings/settings.html:34 +#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems like Google" +" Analytics or Piwik, but also to perform " +"instance-specific customizations like adding a " +"project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 #, fuzzy msgid "Save Settings" msgstr "儲存設定" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" #: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 #, fuzzy msgid "Custom Hooks" msgstr "自訂hook" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 +#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 msgid "Failed to remove hook" msgstr "移除hook失敗" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Description" +msgid "Rescan options" +msgstr "描述" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 msgid "" "Check this option to remove all comments, pull requests and other records" " related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 +msgid "Install Git hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/templates/admin/settings/settings_mapping.html:32 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 +#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " "not seem to come from Kallithea. WARNING: This operation will destroy any" " custom git hooks you may have deployed by hand!" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/templates/admin/settings/settings_mapping.html:41 +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 +#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 msgid "Reindex" msgstr "重新索引" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 +#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 msgid "Show repository size after push" msgstr "push 後顯示版本庫大小" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 msgid "Log user push commands" msgstr "紀錄使用者推送命令" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 msgid "Log user pull commands" msgstr "紀錄使用者抓取命令" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 msgid "Update repository after push (hg update)" msgstr "push後更新版本庫 (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 #, fuzzy msgid "Mercurial extensions" msgstr "Mercurial 版本庫" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 msgid "Enable hgsubversion extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 #, fuzzy msgid "Location of repositories" msgstr "建立版本庫" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting" " take effect." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4115,102 +4248,127 @@ "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:62 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 +#: kallithea/tests/data/templates/summary/summary.html.py:133 +#, fuzzy +msgid "Clone URL" +msgstr "複製連結" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." "\n" -" The following " +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user" +" username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "repositories" +msgid "Repository page size" +msgstr "個版本庫" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 #, fuzzy msgid "Meta Tagging" msgstr "設定" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 +#: kallithea/tests/data/templates/base/base.html.py:255 +#: kallithea/tests/data/templates/base/base.html.py:702 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 +#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 #, fuzzy msgid "Show Members" msgstr "成員" @@ -4221,13 +4379,15 @@ msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 msgid "Members" msgstr "成員" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4236,49 +4396,60 @@ msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "啟用的成員" #: kallithea/templates/admin/user_groups/user_groups.html:5 +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 #, fuzzy msgid "User Groups Administration" msgstr "使用者管理員" #: kallithea/templates/admin/users/user_add.html:5 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "新增使用者" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 +#: kallithea/tests/data/templates/admin/users/users.html.py:145 +#: kallithea/tests/data/templates/base/base.html.py:251 msgid "Users" msgstr "使用者" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 +#: kallithea/tests/data/templates/admin/users/users.html.py:105 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 msgid "Password confirmation" msgstr "" #: kallithea/templates/admin/users/user_edit.html:5 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "" #: kallithea/templates/admin/users/user_edit.html:30 +#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "" @@ -4288,12 +4459,14 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 +#: kallithea/tests/data/templates/admin/users/users.html.py:115 msgid "Last Login" msgstr "" @@ -4302,7 +4475,8 @@ msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4311,950 +4485,1247 @@ msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 msgid "New password confirmation" msgstr "" #: kallithea/templates/admin/users/users.html:5 +#: kallithea/tests/data/templates/admin/users/users.html.py:163 #, fuzzy msgid "Users Administration" msgstr "使用者管理員" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 +#: kallithea/tests/data/templates/admin/users/users.html.py:121 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 +#: kallithea/tests/data/templates/base/base.html.py:59 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 +#: kallithea/tests/data/templates/base/base.html.py:78 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/tests/data/templates/base/base.html.py:213 msgid "Mercurial repository" msgstr "Mercurial 版本庫" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/tests/data/templates/base/base.html.py:217 msgid "Git repository" msgstr "Git 版本庫" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:114 +#: kallithea/tests/data/templates/base/base.html.py:322 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 +#: kallithea/templates/base/base.html:125 #: kallithea/templates/summary/summary.html:8 +#: kallithea/tests/data/templates/base/base.html.py:333 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 +#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "概況" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/base/base.html:129 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/tests/data/templates/base/base.html.py:341 +#: kallithea/tests/data/templates/base/base.html.py:349 +#: kallithea/tests/data/templates/changelog/changelog.html.py:321 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 msgid "Changelog" msgstr "修改紀錄" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:131 #: kallithea/templates/files/files.html:11 +#: kallithea/tests/data/templates/base/base.html.py:356 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 +#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "檔案" -#: kallithea/templates/base/base.html:142 -#: kallithea/templates/base/base.html:144 +#: kallithea/templates/base/base.html:137 +#: kallithea/templates/base/base.html:139 +#: kallithea/tests/data/templates/base/base.html.py:366 +#: kallithea/tests/data/templates/base/base.html.py:370 msgid "Options" msgstr "選項" -#: kallithea/templates/base/base.html:152 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:147 +#: kallithea/templates/forks/forks_data.html:18 +#: kallithea/tests/data/templates/base/base.html.py:383 +#: kallithea/tests/data/templates/forks/forks_data.html.py:59 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:154 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:149 +#: kallithea/tests/data/templates/base/base.html.py:388 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:156 -#: kallithea/templates/base/base.html:331 +#: kallithea/templates/base/base.html:151 +#: kallithea/templates/base/base.html:320 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 +#: kallithea/tests/data/templates/base/base.html.py:392 +#: kallithea/tests/data/templates/base/base.html.py:544 +#: kallithea/tests/data/templates/search/search.html.py:134 +#: kallithea/tests/data/templates/search/search.html.py:185 msgid "Search" msgstr "搜尋" -#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:155 +#: kallithea/tests/data/templates/base/base.html.py:399 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:162 +#: kallithea/templates/base/base.html:157 +#: kallithea/tests/data/templates/base/base.html.py:405 msgid "Lock" msgstr "" +#: kallithea/templates/base/base.html:165 +#: kallithea/tests/data/templates/base/base.html.py:413 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:166 +#: kallithea/tests/data/templates/base/base.html.py:415 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 +#: kallithea/tests/data/templates/base/base.html.py:419 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 +msgid "Fork" +msgstr "分支" + #: kallithea/templates/base/base.html:170 -msgid "Follow" -msgstr "" - -#: kallithea/templates/base/base.html:171 -msgid "Unfollow" -msgstr "" - -#: kallithea/templates/base/base.html:174 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" -msgstr "分支" +#: kallithea/templates/pullrequests/pullrequest.html:77 +#: kallithea/tests/data/templates/base/base.html.py:423 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 +msgid "Create Pull Request" +msgstr "" #: kallithea/templates/base/base.html:175 -#: kallithea/templates/pullrequests/pullrequest.html:88 -msgid "Create Pull Request" -msgstr "" - -#: kallithea/templates/base/base.html:180 +#: kallithea/tests/data/templates/base/base.html.py:430 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: kallithea/templates/base/base.html:193 +#: kallithea/templates/base/base.html:188 +#: kallithea/tests/data/templates/base/base.html.py:439 msgid "Switch To" msgstr "" -#: kallithea/templates/base/base.html:203 -#: kallithea/templates/base/base.html:485 +#: kallithea/templates/base/base.html:198 +#: kallithea/templates/base/base.html:458 +#: kallithea/tests/data/templates/base/base.html.py:441 +#: kallithea/tests/data/templates/base/base.html.py:656 msgid "No matches found" msgstr "" -#: kallithea/templates/base/base.html:305 +#: kallithea/templates/base/base.html:294 +#: kallithea/tests/data/templates/base/base.html.py:494 msgid "Show recent activity" msgstr "" +#: kallithea/templates/base/base.html:300 +#: kallithea/templates/base/base.html:301 +#: kallithea/tests/data/templates/base/base.html.py:504 +#: kallithea/tests/data/templates/base/base.html.py:508 +msgid "Public journal" +msgstr "公開日誌" + +#: kallithea/templates/base/base.html:306 +#: kallithea/tests/data/templates/base/base.html.py:513 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:307 +#: kallithea/tests/data/templates/base/base.html.py:517 +msgid "Gists" +msgstr "" + #: kallithea/templates/base/base.html:311 -#: kallithea/templates/base/base.html:312 -msgid "Public journal" -msgstr "公開日誌" - -#: kallithea/templates/base/base.html:317 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:318 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:322 +#: kallithea/tests/data/templates/base/base.html.py:525 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:324 +#: kallithea/templates/base/base.html:313 +#: kallithea/tests/data/templates/base/base.html.py:531 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:325 +#: kallithea/templates/base/base.html:314 +#: kallithea/tests/data/templates/base/base.html.py:535 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:330 +#: kallithea/templates/base/base.html:319 +#: kallithea/tests/data/templates/base/base.html.py:540 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:353 -#: kallithea/templates/base/base.html:354 +#: kallithea/templates/base/base.html:342 +#: kallithea/templates/base/base.html:343 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +#: kallithea/tests/data/templates/base/base.html.py:573 +#: kallithea/tests/data/templates/base/base.html.py:577 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:377 +#: kallithea/templates/base/base.html:367 +#: kallithea/tests/data/templates/base/base.html.py:602 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:384 +#: kallithea/templates/base/base.html:375 +#: kallithea/tests/data/templates/base/base.html.py:607 msgid "Login to Your Account" msgstr "" +#: kallithea/templates/base/base.html:385 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" +msgstr "忘記密碼?" + +#: kallithea/templates/base/base.html:389 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "沒有帳號?" + #: kallithea/templates/base/base.html:407 -msgid "Forgot password ?" -msgstr "忘記密碼?" - -#: kallithea/templates/base/base.html:434 +#: kallithea/tests/data/templates/base/base.html.py:648 msgid "Log Out" msgstr "登出" -#: kallithea/templates/base/base.html:615 -msgid "Keyboard shortcuts" -msgstr "" - -#: kallithea/templates/base/base.html:624 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +#: kallithea/templates/base/default_perms_box.html:11 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 #, fuzzy msgid "Inherit defaults" msgstr "個版本庫" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 msgid "Create repositories" msgstr "建立版本庫" +#: kallithea/templates/base/default_perms_box.html:27 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 +#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:39 +#: kallithea/tests/data/templates/base/perms_summary.html.py:51 +#: kallithea/tests/data/templates/changelog/changelog.html.py:128 msgid "Show" msgstr "顯示" #: kallithea/templates/base/perms_summary.html:22 +#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 +#: kallithea/tests/data/templates/base/perms_summary.html.py:90 +#: kallithea/tests/data/templates/base/perms_summary.html.py:113 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 +#: kallithea/tests/data/templates/base/perms_summary.html.py:94 +#: kallithea/tests/data/templates/base/perms_summary.html.py:117 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 +#: kallithea/tests/data/templates/base/perms_summary.html.py:169 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 +#: kallithea/templates/base/root.html:25 +#: kallithea/tests/data/templates/base/root.html.py:85 #, fuzzy msgid "Add Another Comment" msgstr "" -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 +#: kallithea/templates/base/root.html:26 +#: kallithea/tests/data/templates/base/root.html.py:87 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 msgid "Stop following this repository" msgstr "停止追蹤這個版本庫" -#: kallithea/templates/base/root.html:24 +#: kallithea/templates/base/root.html:27 +#: kallithea/tests/data/templates/base/root.html.py:89 msgid "Start following this repository" msgstr "開始追蹤這個版本庫" -#: kallithea/templates/base/root.html:25 +#: kallithea/templates/base/root.html:28 +#: kallithea/tests/data/templates/base/root.html.py:91 msgid "Group" msgstr "群組" -#: kallithea/templates/base/root.html:26 +#: kallithea/templates/base/root.html:29 +#: kallithea/tests/data/templates/base/root.html.py:93 msgid "members" msgstr "成員" -#: kallithea/templates/base/root.html:27 +#: kallithea/templates/base/root.html:30 +#: kallithea/tests/data/templates/base/root.html.py:95 msgid "Loading ..." msgstr "" -#: kallithea/templates/base/root.html:28 -msgid "loading ..." -msgstr "" - -#: kallithea/templates/base/root.html:29 -msgid "Search truncated" -msgstr "" - -#: kallithea/templates/base/root.html:30 -msgid "No matching files" -msgstr "" - #: kallithea/templates/base/root.html:31 -msgid "Open New Pull Request from {0}" +#: kallithea/tests/data/templates/base/root.html.py:97 +msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" +#: kallithea/tests/data/templates/base/root.html.py:99 +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets {0} → {1}" +#: kallithea/tests/data/templates/base/root.html.py:101 +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" +#: kallithea/tests/data/templates/base/root.html.py:103 +msgid "Open New Pull Request from {0}" msgstr "" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/tests/data/templates/base/root.html.py:105 +msgid "Open New Pull Request for {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:36 +#: kallithea/tests/data/templates/base/root.html.py:107 +msgid "Show Selected Changesets {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:37 +#: kallithea/tests/data/templates/base/root.html.py:109 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:38 +#: kallithea/templates/changeset/diff_block.html:7 +#: kallithea/tests/data/templates/base/root.html.py:111 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 #, fuzzy msgid "Collapse Diff" msgstr "檔案差異" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:39 +#: kallithea/tests/data/templates/base/root.html.py:113 #, fuzzy msgid "Expand Diff" msgstr "檔案差異" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:40 +#: kallithea/tests/data/templates/base/root.html.py:115 msgid "Failed to revoke permission" msgstr "" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:41 +#: kallithea/tests/data/templates/base/root.html.py:117 msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "" -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/base/root.html:42 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/compare/compare_diff.html:108 +#: kallithea/tests/data/templates/base/root.html.py:123 +msgid "Select changeset" +msgstr "" + +#: kallithea/templates/base/root.html:45 +#: kallithea/tests/data/templates/base/root.html.py:125 msgid "Specify changeset" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "修訂" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" +#: kallithea/templates/base/root.html:46 +#: kallithea/tests/data/templates/base/root.html.py:127 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:47 +#: kallithea/tests/data/templates/base/root.html.py:129 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:48 +#: kallithea/tests/data/templates/base/root.html.py:131 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:49 +#: kallithea/tests/data/templates/base/root.html.py:133 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:50 +#: kallithea/tests/data/templates/base/root.html.py:135 +msgid "Loading..." msgstr "" #: kallithea/templates/changelog/changelog.html:6 +#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "" #: kallithea/templates/changelog/changelog.html:21 +#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:45 +#: kallithea/tests/data/templates/changelog/changelog.html.py:141 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:52 +#: kallithea/tests/data/templates/changelog/changelog.html.py:147 #, fuzzy msgid "Go to tip of repository" msgstr "Git 版本庫" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:57 +#: kallithea/templates/forks/forks_data.html:16 +#: kallithea/tests/data/templates/changelog/changelog.html.py:151 +#: kallithea/tests/data/templates/forks/forks_data.html.py:55 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/tests/data/templates/changelog/changelog.html.py:155 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:63 #: kallithea/templates/files/files.html:29 +#: kallithea/tests/data/templates/changelog/changelog.html.py:158 +#: kallithea/tests/data/templates/files/files.html.py:117 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 +#: kallithea/templates/changelog/changelog.html:86 +#: kallithea/templates/changelog/changelog_summary_data.html:18 +#: kallithea/tests/data/templates/changelog/changelog.html.py:183 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 #, python-format msgid "" "Changeset status: %s by %s\n" "Click to open associated pull request %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/changelog/changelog_summary_data.html:24 +#: kallithea/templates/changelog/changelog.html:90 +#: kallithea/templates/changelog/changelog_summary_data.html:22 +#: kallithea/tests/data/templates/changelog/changelog.html.py:191 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 #, fuzzy, python-format -#| msgid "Set changeset status" msgid "Changeset status: %s by %s" msgstr "尚未有任何變更" +#: kallithea/templates/changelog/changelog.html:107 +#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/tests/data/templates/changelog/changelog.html.py:217 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 +msgid "Expand commit message" +msgstr "" + #: kallithea/templates/changelog/changelog.html:116 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:125 -#: kallithea/templates/compare/compare_cs.html:30 +#: kallithea/templates/compare/compare_cs.html:41 +#: kallithea/tests/data/templates/changelog/changelog.html.py:225 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 msgid "Changeset has comments" msgstr "" -#: kallithea/templates/changelog/changelog.html:135 -#: kallithea/templates/changelog/changelog_summary_data.html:57 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 +#: kallithea/templates/changelog/changelog.html:151 +#: kallithea/templates/changelog/changelog_summary_data.html:53 +#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset_range.html:84 +#: kallithea/tests/data/templates/changelog/changelog.html.py:234 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 +#: kallithea/tests/data/templates/changeset/changeset.html.py:216 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 #, python-format msgid "Bookmark %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:141 -#: kallithea/templates/changelog/changelog_summary_data.html:63 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#: kallithea/templates/compare/compare_cs.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:203 +#: kallithea/templates/changelog/changelog.html:157 +#: kallithea/templates/changelog/changelog_summary_data.html:59 +#: kallithea/templates/changeset/changeset.html:85 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/compare/compare_cs.html:82 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +#: kallithea/tests/data/templates/changelog/changelog.html.py:240 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 +#: kallithea/tests/data/templates/changeset/changeset.html.py:223 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 #, python-format msgid "Tag %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:146 -#: kallithea/templates/changelog/changelog_summary_data.html:68 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 +#: kallithea/templates/changelog/changelog.html:162 +#: kallithea/templates/changelog/changelog_summary_data.html:64 +#: kallithea/templates/changeset/changeset.html:90 +#: kallithea/templates/changeset/changeset_range.html:94 +#: kallithea/tests/data/templates/changelog/changelog.html.py:246 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 +#: kallithea/tests/data/templates/changeset/changeset.html.py:230 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 #, python-format msgid "Branch %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:311 +#: kallithea/templates/changelog/changelog.html:326 +#: kallithea/tests/data/templates/changelog/changelog.html.py:289 msgid "There are no changes yet" msgstr "尚未有任何變更" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:77 +#: kallithea/templates/changeset/changeset.html:98 +#: kallithea/tests/data/templates/changeset/changeset.html.py:187 msgid "Removed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:78 +#: kallithea/templates/changeset/changeset.html:99 +#: kallithea/tests/data/templates/changeset/changeset.html.py:191 msgid "Changed" msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:47 +#: kallithea/templates/changeset/changeset.html:100 +#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/tests/data/templates/changeset/changeset.html.py:195 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 msgid "Added" msgstr "" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:81 -#: kallithea/templates/changeset/changeset.html:82 -#: kallithea/templates/changeset/changeset.html:83 +#: kallithea/templates/changeset/changeset.html:102 +#: kallithea/templates/changeset/changeset.html:103 +#: kallithea/templates/changeset/changeset.html:104 +#: kallithea/tests/data/templates/changeset/changeset.html.py:201 +#: kallithea/tests/data/templates/changeset/changeset.html.py:203 +#: kallithea/tests/data/templates/changeset/changeset.html.py:205 #, python-format msgid "Affected %s files" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 +#: kallithea/tests/data/templates/files/files_browser.html.py:52 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 +msgid "Revision" +msgstr "修訂" + #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 +#: kallithea/tests/data/templates/files/files_add.html.py:243 msgid "Commit Message" msgstr "" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "" +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 +msgid "Author" +msgstr "" + #: kallithea/templates/changelog/changelog_summary_data.html:11 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:84 +#: kallithea/templates/changelog/changelog_summary_data.html:79 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 msgid "Add or upload files directly via Kallithea" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:87 +#: kallithea/templates/changelog/changelog_summary_data.html:82 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 +#: kallithea/tests/data/templates/files/files_add.html.py:159 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:93 +#: kallithea/templates/changelog/changelog_summary_data.html:88 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 #, fuzzy msgid "Push new repository" msgstr "私有版本庫" -#: kallithea/templates/changelog/changelog_summary_data.html:101 +#: kallithea/templates/changelog/changelog_summary_data.html:96 +#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 msgid "Existing repository?" msgstr "" #: kallithea/templates/changeset/changeset.html:8 +#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "" #: kallithea/templates/changeset/changeset.html:36 +#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "" #: kallithea/templates/changeset/changeset.html:42 +#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "" -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:39 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:162 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 msgid "Changeset status" msgstr "" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:47 +#: kallithea/tests/data/templates/changeset/changeset.html.py:169 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 msgid "Raw diff" msgstr "" #: kallithea/templates/changeset/changeset.html:57 +#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:75 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:50 +#: kallithea/tests/data/templates/changeset/changeset.html.py:177 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:73 +#: kallithea/templates/changeset/changeset_range.html:80 +#: kallithea/tests/data/templates/changeset/changeset.html.py:210 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 #, fuzzy msgid "Merge" msgstr "合併" +#: kallithea/templates/changeset/changeset.html:117 +#: kallithea/tests/data/templates/changeset/changeset.html.py:250 +msgid "Grafted from:" +msgstr "" + #: kallithea/templates/changeset/changeset.html:123 -msgid "Grafted from:" +#: kallithea/tests/data/templates/changeset/changeset.html.py:260 +msgid "Transplanted from:" msgstr "" #: kallithea/templates/changeset/changeset.html:129 -msgid "Transplanted from:" -msgstr "" - -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/tests/data/templates/changeset/changeset.html.py:267 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:143 +#: kallithea/tests/data/templates/changeset/changeset.html.py:288 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:60 -#: kallithea/templates/pullrequests/pullrequest_show.html:329 +#: kallithea/templates/changeset/changeset.html:160 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:303 +#: kallithea/tests/data/templates/changeset/changeset.html.py:311 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:62 -#: kallithea/templates/pullrequests/pullrequest_show.html:331 +#: kallithea/templates/changeset/changeset.html:162 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/tests/data/templates/changeset/changeset.html.py:315 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" -#: kallithea/templates/changeset/changeset.html:182 +#: kallithea/templates/changeset/changeset.html:176 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:350 -#: kallithea/templates/pullrequests/pullrequest_show.html:372 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:322 +#: kallithea/templates/pullrequests/pullrequest_show.html:348 +#: kallithea/tests/data/templates/changeset/changeset.html.py:336 +#: kallithea/tests/data/templates/changeset/changeset.html.py:351 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:231 -#: kallithea/templates/changeset/changeset.html:268 +#: kallithea/templates/changeset/changeset.html:233 +#: kallithea/templates/changeset/changeset.html:270 +#: kallithea/tests/data/templates/changeset/changeset.html.py:368 +#: kallithea/tests/data/templates/changeset/changeset.html.py:378 #, fuzzy msgid "No revisions" msgstr "修訂" -#: kallithea/templates/changeset/changeset_file_comment.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:19 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 msgid "on pull request" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 #, fuzzy msgid "No title" msgstr "沒有檔案" -#: kallithea/templates/changeset/changeset_file_comment.html:24 +#: kallithea/templates/changeset/changeset_file_comment.html:22 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 #, fuzzy msgid "on this changeset" msgstr "沒有修改" -#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:29 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 #, fuzzy msgid "Delete comment?" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 #, fuzzy msgid "Status change" msgstr "多個檔案修改" -#: kallithea/templates/changeset/changeset_file_comment.html:59 +#: kallithea/templates/changeset/changeset_file_comment.html:57 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 msgid "Commenting on line." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:60 +#: kallithea/templates/changeset/changeset_file_comment.html:58 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 msgid "" "Comments are in plain text. Use @username inside this text to notify " "another user." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 #, fuzzy msgid "Set changeset status" msgstr "尚未有任何變更" -#: kallithea/templates/changeset/changeset_file_comment.html:69 +#: kallithea/templates/changeset/changeset_file_comment.html:67 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 msgid "Vote for pull request status" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:75 +#: kallithea/templates/changeset/changeset_file_comment.html:73 +#: kallithea/templates/changeset/diff_block.html:46 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 #, fuzzy msgid "No change" msgstr "沒有修改" -#: kallithea/templates/changeset/changeset_file_comment.html:88 +#: kallithea/templates/changeset/changeset_file_comment.html:86 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 #, fuzzy msgid "Finish pull request" msgstr "文件內容" -#: kallithea/templates/changeset/changeset_file_comment.html:91 +#: kallithea/templates/changeset/changeset_file_comment.html:89 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 msgid "Close" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:103 +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 msgid "Submitting ..." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:104 +#: kallithea/templates/changeset/changeset_file_comment.html:102 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:112 +#: kallithea/templates/changeset/changeset_file_comment.html:110 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:116 +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/templates/changeset/changeset_file_comment.html:126 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" -#: kallithea/templates/changeset/changeset_file_comment.html:129 +#: kallithea/templates/changeset/changeset_file_comment.html:127 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 #, fuzzy, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "" -#: kallithea/templates/changeset/changeset_file_comment.html:130 +#: kallithea/templates/changeset/changeset_file_comment.html:128 +#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 #, python-format msgid "%d general" msgid_plural "%d general" msgstr[0] "" #: kallithea/templates/changeset/changeset_range.html:5 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#: kallithea/templates/compare/compare_cs.html:37 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 +#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:54 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "移除檔案" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "未修改" + +#: kallithea/templates/changeset/diff_block.html:42 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 #, fuzzy msgid "Deleted" msgstr "刪除" -#: kallithea/templates/changeset/diff_block.html:57 +#: kallithea/templates/changeset/diff_block.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 #, fuzzy msgid "Renamed" msgstr "讀" -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:43 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "未知修訂 %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "New file type" +msgid "No file after" +msgstr "未知的存檔類型" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "檔案新增" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:41 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:69 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:44 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:83 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 msgid "Show inline comments" msgstr "" #: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 +#: kallithea/templates/compare/compare_cs.html:11 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:14 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:18 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:55 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 msgid "First (oldest) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:46 +#: kallithea/templates/compare/compare_cs.html:57 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 msgid "Last (most recent) changeset in this list" msgstr "" -#: kallithea/templates/compare/compare_cs.html:48 +#: kallithea/templates/compare/compare_cs.html:59 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 msgid "Position in this list of changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:85 +#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:321 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:99 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:107 +#: kallithea/templates/compare/compare_cs.html:112 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:108 +#: kallithea/templates/compare/compare_cs.html:113 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 #, fuzzy, python-format msgid "%s changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:109 +#: kallithea/templates/compare/compare_cs.html:114 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 #, fuzzy msgid "behind" msgstr "重新索引" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "" #: kallithea/templates/compare/compare_diff.html:39 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "" #: kallithea/templates/compare/compare_diff.html:48 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:316 +#: kallithea/templates/pullrequests/pullrequest_show.html:291 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" -#: kallithea/templates/compare/compare_diff.html:84 -#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 +#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:20 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 msgid "Public repository" msgstr "公開的版本庫" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:31 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 msgid "No changesets yet" msgstr "尚未有任何變更" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:52 +#: kallithea/templates/data_table/_dt_elements.html:54 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 #, python-format msgid "Subscribe to %s rss feed" msgstr "訂閱 %s rss" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:60 +#: kallithea/templates/data_table/_dt_elements.html:62 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 #, python-format msgid "Subscribe to %s atom feed" msgstr "訂閱 %s atom" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "Comment on Changeset \"%s\"" +msgstr "尚未有任何變更" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changesets" +msgid "Changeset on" +msgstr "變更" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +#: kallithea/templates/email_templates/pull_request_comment.html:28 +#, fuzzy +#| msgid "Branches" +msgid "branch" +msgstr "分支" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:27 +#: kallithea/templates/email_templates/pull_request_comment.html:35 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "多個檔案修改" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "Repository has been locked" +msgid "The pull request has been closed." +msgstr "儲存所已被鎖定" + +#: kallithea/templates/email_templates/password_reset.html:9 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 msgid "We have received a request to reset the password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:8 +#: kallithea/templates/email_templates/password_reset.html:25 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 msgid "" "This account is however managed outside this system and the password " "cannot be changed here." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:28 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:13 +#: kallithea/templates/email_templates/password_reset.html:33 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:16 +#: kallithea/templates/email_templates/password_reset.html:44 +#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 +#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy, python-format +#| msgid "Pull request %s" +msgid "Pull request from" +msgstr "提取要求 %s" + +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request.html:20 +#, fuzzy +#| msgid "Date" +msgid "at" +msgstr "時間" + +#: kallithea/templates/email_templates/pull_request.html:17 +#: kallithea/templates/email_templates/pull_request_comment.html:25 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "提取要求 %s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "提取要求 %s" + +#: kallithea/templates/email_templates/registration.html:22 +#, fuzzy +#| msgid "Group name" +msgid "Full Name" +msgstr "群組名稱" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5272,85 +5743,107 @@ msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 +#: kallithea/tests/data/templates/files/files.html.py:138 +#: kallithea/tests/data/templates/files/files.html.py:218 #, python-format msgid "%s Files" msgstr "" #: kallithea/templates/files/files_add.html:4 +#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 +#: kallithea/tests/data/templates/files/files_add.html.py:225 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "位置" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 +#: kallithea/tests/data/templates/files/files_add.html.py:229 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:233 +#: kallithea/tests/data/templates/files/files_add.html.py:237 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/tests/data/templates/files/files_add.html.py:235 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 +#: kallithea/tests/data/templates/files/files_add.html.py:239 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 +#: kallithea/tests/data/templates/files/files_add.html.py:241 #, fuzzy msgid "New file type" msgstr "未知的存檔類型" -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 -#: kallithea/templates/files/files_edit.html:67 +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +#: kallithea/tests/data/templates/files/files_add.html.py:247 #, fuzzy msgid "Commit Changes" msgstr "遞交修改" #: kallithea/templates/files/files_browser.html:33 +#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "" #: kallithea/templates/files/files_browser.html:35 +#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "" -#: kallithea/templates/files/files_browser.html:41 +#: kallithea/templates/files/files_browser.html:42 +#: kallithea/tests/data/templates/files/files_browser.html.py:68 msgid "Follow current branch" msgstr "" -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:46 +#: kallithea/tests/data/templates/files/files_browser.html.py:70 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:50 +#: kallithea/tests/data/templates/files/files_browser.html.py:72 msgid "Loading file list..." msgstr "載入檔案列表..." -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/summary/summary.html:144 +#: kallithea/tests/data/templates/files/files_browser.html.py:78 msgid "Size" msgstr "大小" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:64 +#: kallithea/tests/data/templates/files/files_browser.html.py:80 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:65 +#: kallithea/tests/data/templates/files/files_browser.html.py:82 #, fuzzy msgid "Last Modified" msgstr "最後修改" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:66 +#: kallithea/tests/data/templates/files/files_browser.html.py:84 #, fuzzy msgid "Last Committer" msgstr "最後的遞交者" @@ -5361,7 +5854,7 @@ msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5374,109 +5867,128 @@ msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +#: kallithea/tests/data/templates/files/files_source.html.py:70 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +#: kallithea/tests/data/templates/files/files_source.html.py:75 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 +#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 +#: kallithea/tests/data/templates/files/files_source.html.py:44 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 +#: kallithea/tests/data/templates/files/files_source.html.py:46 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +#: kallithea/tests/data/templates/files/files_source.html.py:50 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 +#: kallithea/tests/data/templates/files/files_source.html.py:52 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 +#: kallithea/tests/data/templates/files/files_source.html.py:66 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +#: kallithea/tests/data/templates/files/files_source.html.py:86 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +#: kallithea/tests/data/templates/files/files_source.html.py:92 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 +#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 +#: kallithea/tests/data/templates/files/files_source.html.py:111 #, python-format msgid "Binary file (%s)" msgstr "二進位檔 (%s)" -#: kallithea/templates/files/files_source.html:74 +#: kallithea/templates/files/files_source.html:69 +#: kallithea/tests/data/templates/files/files_source.html.py:125 #, fuzzy msgid "File is too big to display." msgstr "顯示的檔案太大" -#: kallithea/templates/files/files_source.html:76 +#: kallithea/templates/files/files_source.html:71 +#: kallithea/tests/data/templates/files/files_source.html.py:129 msgid "Show full annotation anyway." msgstr "" -#: kallithea/templates/files/files_source.html:78 +#: kallithea/templates/files/files_source.html:73 +#: kallithea/tests/data/templates/files/files_source.html.py:133 msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "" #: kallithea/templates/files/files_ypjax.html:23 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "" #: kallithea/templates/files/files_ypjax.html:24 +#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "" #: kallithea/templates/followers/followers.html:5 +#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:129 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/tests/data/templates/followers/followers.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:207 +#: kallithea/tests/data/templates/summary/summary.html.py:211 msgid "Followers" msgstr "追蹤者" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 +#: kallithea/tests/data/templates/followers/followers_data.html.py:44 msgid "Started following -" msgstr "" @@ -5485,70 +5997,80 @@ msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "分支名稱" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "私有" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" #: kallithea/templates/forks/forks.html:5 +#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:135 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/tests/data/templates/forks/forks.html.py:113 +#: kallithea/tests/data/templates/summary/summary.html.py:215 +#: kallithea/tests/data/templates/summary/summary.html.py:219 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 +#: kallithea/tests/data/templates/forks/forks_data.html.py:49 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 +#: kallithea/tests/data/templates/forks/forks_data.html.py:66 msgid "There are no forks yet" msgstr "尚未有任何 fork" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 +#: kallithea/tests/data/templates/journal/journal.html.py:156 msgid "ATOM journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 +#: kallithea/tests/data/templates/journal/journal.html.py:160 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 +#: kallithea/tests/data/templates/journal/journal.html.py:200 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 +#: kallithea/tests/data/templates/journal/journal_data.html.py:82 msgid "No entries yet" msgstr "" @@ -5562,34 +6084,45 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:51 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:60 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 msgid "Destination repository" msgstr "" @@ -5625,7 +6158,9 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:72 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 msgid "Closed" msgstr "" @@ -5643,126 +6178,160 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:6 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, python-format msgid "%s Pull Request %s" msgstr "" #: kallithea/templates/pullrequests/pullrequest_show.html:10 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, python-format msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:53 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 #, fuzzy msgid "Summarize the changes" msgstr "遞交修改" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 msgid "Reviewer voting result" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +msgid "Pull request status calculated from votes" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 -msgid "Pull request status calculated from votes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:93 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 msgid "Still not reviewed by" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" -#: kallithea/templates/pullrequests/pullrequest_show.html:99 +#: kallithea/templates/pullrequests/pullrequest_show.html:85 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 msgid "Pull request was reviewed by all reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:101 +#: kallithea/templates/pullrequests/pullrequest_show.html:87 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 #, fuzzy msgid "There are no reviewers" msgstr "沒有任何分支" -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 #, fuzzy msgid "on" msgstr "無" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:106 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:114 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -#, fuzzy -msgid "Update" -msgstr "時間" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 -msgid "Current revision - no change" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:215 -msgid "" -"Pull requests do not change once created. Select a revision and save to " -"replace this pull request with a new one." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:224 -msgid "Pull Request Reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:249 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 #, fuzzy -msgid "Remove reviewer" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:261 -msgid "Type name of reviewer to add" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:269 -#, fuzzy -msgid "Potential Reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:272 -msgid "Click to add the repository owner as reviewer:" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:295 +#| msgid "Registration" +msgid "Next iteration" +msgstr "註冊" + +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision and save to make a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:296 -msgid "Save Updates as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:297 +#: kallithea/templates/pullrequests/pullrequest_show.html:198 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:199 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 #, fuzzy msgid "Cancel Changes" msgstr "沒有修改" -#: kallithea/templates/pullrequests/pullrequest_show.html:307 +#: kallithea/templates/pullrequests/pullrequest_show.html:207 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 +msgid "Pull Request Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:233 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 +#, fuzzy +msgid "Remove reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:245 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:253 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 +#, fuzzy +msgid "Potential Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:256 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:281 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 #, fuzzy msgid "Pull Request Content" msgstr "文件內容" +#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 +#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 +msgid "Common ancestor" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5778,243 +6347,466 @@ msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" #: kallithea/templates/search/search.html:6 +#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 +#: kallithea/tests/data/templates/search/search.html.py:189 +#: kallithea/tests/data/templates/search/search.html.py:221 #, fuzzy msgid "Search in All Repositories" msgstr "Mercurial 版本庫" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 +#: kallithea/tests/data/templates/search/search.html.py:130 msgid "Search term" msgstr "搜尋關鍵字" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 +#: kallithea/tests/data/templates/search/search.html.py:138 msgid "Search in" msgstr "搜尋範圍" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 +#: kallithea/tests/data/templates/search/search.html.py:140 msgid "File contents" msgstr "文件內容" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 +#: kallithea/tests/data/templates/search/search.html.py:141 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 +#: kallithea/tests/data/templates/search/search.html.py:142 msgid "File names" msgstr "檔案名稱" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +#: kallithea/tests/data/templates/search/search_commit.html.py:68 +#: kallithea/tests/data/templates/search/search_content.html.py:53 +#: kallithea/tests/data/templates/search/search_path.html.py:47 msgid "Permission denied" msgstr "權限不足" #: kallithea/templates/summary/statistics.html:4 +#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:197 +#: kallithea/tests/data/templates/summary/summary.html.py:323 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:36 +#: kallithea/tests/data/templates/summary/statistics.html.py:201 +#: kallithea/tests/data/templates/summary/summary.html.py:327 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:32 +#: kallithea/templates/summary/summary.html:90 +#: kallithea/templates/summary/summary.html:104 +#: kallithea/tests/data/templates/summary/statistics.html.py:131 +#: kallithea/tests/data/templates/summary/summary.html.py:165 +#: kallithea/tests/data/templates/summary/summary.html.py:182 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/tests/data/templates/summary/statistics.html.py:135 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:84 +#: kallithea/templates/summary/summary.html:323 +#: kallithea/tests/data/templates/summary/statistics.html.py:142 +#: kallithea/tests/data/templates/summary/summary.html.py:289 msgid "files" msgstr "檔案" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:108 +#: kallithea/templates/summary/summary.html:349 +#: kallithea/tests/data/templates/summary/statistics.html.py:144 +#: kallithea/tests/data/templates/summary/summary.html.py:291 msgid "Show more" msgstr "" +#: kallithea/templates/summary/statistics.html:388 +#: kallithea/tests/data/templates/summary/statistics.html.py:147 +msgid "commits" +msgstr "遞交" + +#: kallithea/templates/summary/statistics.html:389 +#: kallithea/tests/data/templates/summary/statistics.html.py:149 +msgid "files added" +msgstr "多個檔案新增" + #: kallithea/templates/summary/statistics.html:390 -msgid "commits" -msgstr "遞交" +#: kallithea/tests/data/templates/summary/statistics.html.py:151 +msgid "files changed" +msgstr "多個檔案修改" #: kallithea/templates/summary/statistics.html:391 -msgid "files added" -msgstr "多個檔案新增" - -#: kallithea/templates/summary/statistics.html:392 -msgid "files changed" -msgstr "多個檔案修改" - -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/tests/data/templates/summary/statistics.html.py:153 msgid "files removed" msgstr "移除多個檔案" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:393 +#: kallithea/tests/data/templates/summary/statistics.html.py:155 msgid "commit" msgstr "遞交" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:394 +#: kallithea/tests/data/templates/summary/statistics.html.py:157 msgid "file added" msgstr "檔案新增" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:395 +#: kallithea/tests/data/templates/summary/statistics.html.py:159 msgid "file changed" msgstr "檔案修改" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:396 +#: kallithea/tests/data/templates/summary/statistics.html.py:161 msgid "file removed" msgstr "移除檔案" #: kallithea/templates/summary/summary.html:4 +#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "" #: kallithea/templates/summary/summary.html:13 +#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "" #: kallithea/templates/summary/summary.html:15 +#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "" -#: kallithea/templates/summary/summary.html:22 +#: kallithea/templates/summary/summary.html:21 +#: kallithea/tests/data/templates/summary/summary.html.py:371 msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:26 +#: kallithea/tests/data/templates/summary/summary.html.py:380 msgid "Clone from" msgstr "複製由" +#: kallithea/templates/summary/summary.html:67 +#: kallithea/tests/data/templates/summary/summary.html.py:145 +msgid "Show by ID" +msgstr "" + #: kallithea/templates/summary/summary.html:72 -#, fuzzy -msgid "Clone URL" -msgstr "複製連結" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/tests/data/templates/summary/summary.html.py:143 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:83 +#: kallithea/tests/data/templates/summary/summary.html.py:153 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:97 +#: kallithea/tests/data/templates/summary/summary.html.py:168 msgid "Download" msgstr "下載" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:100 +#: kallithea/tests/data/templates/summary/summary.html.py:174 msgid "There are no downloads yet" msgstr "沒有任何下載" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:102 +#: kallithea/tests/data/templates/summary/summary.html.py:178 msgid "Downloads are disabled for this repository" msgstr "這個版本庫的下載已停用" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:108 +#: kallithea/tests/data/templates/summary/summary.html.py:190 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:112 +#: kallithea/tests/data/templates/summary/summary.html.py:194 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:114 +#: kallithea/tests/data/templates/summary/summary.html.py:196 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:152 +#: kallithea/templates/summary/summary.html:154 +#: kallithea/tests/data/templates/summary/summary.html.py:234 +#: kallithea/tests/data/templates/summary/summary.html.py:240 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:174 +#: kallithea/tests/data/templates/summary/summary.html.py:254 #, fuzzy msgid "Latest Changes" msgstr "多個檔案修改" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:176 +#: kallithea/tests/data/templates/summary/summary.html.py:258 #, fuzzy msgid "Quick Start" msgstr "快速過濾..." -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:191 +#: kallithea/tests/data/templates/summary/summary.html.py:265 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:267 +#: kallithea/tests/data/templates/summary/summary.html.py:276 #, python-format msgid "Download %s as %s" msgstr "下載 %s 為 %s" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" +#: kallithea/tests/data/templates/index.html.py:117 +msgid "Dashboard" +msgstr "儀表板" + +#: kallithea/tests/data/templates/index_base.html.py:98 +msgid "Group Name" +msgstr "" + +#: kallithea/tests/data/templates/login.html.py:77 +msgid "Remember me" +msgstr "" + +#: kallithea/tests/data/templates/admin/gists/new.html.py:209 +msgid "name this file..." +msgstr "" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 +msgid "Change your avatar at" +msgstr "修改您的頭像於" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 +msgid "Using" +msgstr "使用中" + +#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 +msgid "Missing email, please update your user email address." +msgstr "" + +#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 +#, python-format +msgid "%s Repository group dashboard" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 +msgid "Rescan option" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 +msgid "Web" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 +msgid "Require SSL for vcs operations" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 +msgid "" +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 +msgid "Use Gravatars in Kallithea" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." +"\n" +" The following " +"variables are available:\n" +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 +msgid "Dashboard items" +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 +msgid "" +"Number of items displayed in the main page dashboard before pagination is" +" shown." +msgstr "" + +#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 +msgid "Admin pages items" +msgstr "" + +#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 +#: kallithea/tests/data/templates/journal/journal.html.py:118 +msgid "quick filter..." +msgstr "快速過濾..." + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 +msgid "Change avatar at" +msgstr "" + +#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 +msgid "Missing email, please update this user email address." +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:96 +msgid "Keyboard shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:98 +msgid "Site-wide shortcuts" +msgstr "" + +#: kallithea/tests/data/templates/base/base.html.py:619 +msgid "Forgot password ?" +msgstr "忘記密碼?" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 +msgid "Ancestor" +msgstr "" + +#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 +msgid "No common ancestor found - repositories are unrelated" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 +#, python-format +msgid "Comment from %s on %s changeset %s" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 +#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 +msgid "The changeset status was changed to" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/main.html.py:31 +#: kallithea/tests/data/templates/email_templates/main.txt.py:31 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 +#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 +msgid "The comment closed the pull request with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 +#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 +msgid "The comment was made with status" +msgstr "" + +#: kallithea/tests/data/templates/email_templates/registration.html.py:47 +#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 +msgid "View this user here" +msgstr "" + +#: kallithea/tests/data/templates/files/files_source.html.py:80 +#, python-format +msgid "Edit on Branch:%s" +msgstr "" + +#: kallithea/tests/data/templates/summary/summary.html.py:227 +msgid "Repository Size" msgstr "" #~ msgid "No comments." @@ -6068,9 +6860,6 @@ #~ msgid "No Files" #~ msgstr "沒有檔案" -#~ msgid "" -#~ msgstr "" - #~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" #~ msgstr "" @@ -6389,7 +7178,232 @@ #~ msgid "Pull Requests from %s'" #~ msgstr "" +#~ msgid "Missing changesets since the previous pull request:" +#~ msgstr "" + +#~ msgid "New changesets on %s %s since the previous pull request:" +#~ msgstr "" + +#~ msgid "Ancestor didn't change - show diff since previous version:" +#~ msgstr "" + #~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request %s" -#~ msgstr "" +#~ "This pull request is based on " +#~ "another %s revision and there is " +#~ "no simple diff." +#~ msgstr "" + +#~ msgid "No changes found on %s %s since previous version." +#~ msgstr "" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "" + +#~ msgid "Pull request update created" +#~ msgstr "" + +#~ msgid "The following changes are available on %s:" +#~ msgstr "" + +#~ msgid "No changesets found for updating this pull request." +#~ msgstr "" + +#~ msgid "Git pull requests don't support updates yet." +#~ msgstr "" + +#~ msgid "Closing." +#~ msgstr "關閉中。" + +#~ msgid "An error occurred during creation of field" +#~ msgstr "" + +#~ msgid "Changeset not found" +#~ msgstr "" + +#~ msgid "Repository no access" +#~ msgstr "" + +#~ msgid "Repository read access" +#~ msgstr "" + +#~ msgid "Repository write access" +#~ msgstr "" + +#~ msgid "Repository admin access" +#~ msgstr "" + +#~ msgid "Repository Group no access" +#~ msgstr "" + +#~ msgid "Repository Group read access" +#~ msgstr "" + +#~ msgid "Repository Group write access" +#~ msgstr "" + +#~ msgid "Repository Group admin access" +#~ msgstr "" + +#~ msgid "Repository creation disabled" +#~ msgstr "" + +#~ msgid "Repository creation enabled" +#~ msgstr "" + +#~ msgid "Repository forking disabled" +#~ msgstr "" + +#~ msgid "Repository forking enabled" +#~ msgstr "" + +#~ msgid "Register disabled" +#~ msgstr "" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "" + +#~ msgid "Not Reviewed" +#~ msgstr "" + +#~ msgid "Rejected" +#~ msgstr "" + +#~ msgid "Under Review" +#~ msgstr "" + +#~ msgid "Repository group no access" +#~ msgstr "" + +#~ msgid "Repository group read access" +#~ msgstr "" + +#~ msgid "Repository group write access" +#~ msgstr "" + +#~ msgid "Repository group admin access" +#~ msgstr "" + +#~ msgid "User group no access" +#~ msgstr "" + +#~ msgid "User group read access" +#~ msgstr "" + +#~ msgid "User group write access" +#~ msgstr "" + +#~ msgid "User group admin access" +#~ msgstr "" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "" + +#~ msgid "User Group creation disabled" +#~ msgstr "" + +#~ msgid "User Group creation enabled" +#~ msgstr "" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "" + +#~ msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +#~ msgstr "" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" + +#~ msgid "No repositories found." +#~ msgstr "" + +#~ msgid "There are no branches yet" +#~ msgstr "沒有任何分支" + +#~ msgid "There are no tags yet" +#~ msgstr "沒有任何標籤" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "" + +#~ msgid "Analytics HTML block" +#~ msgstr "" + +#~ msgid "" +#~ "HTML with JavaScript for web analytics" +#~ " systems like Google Analytics or " +#~ "Piwik. This will be added at the" +#~ " bottom of every page." +#~ msgstr "" + +#~ msgid "" +#~ "Schema of clone URL construction eg. " +#~ "'{scheme}://{user}@{netloc}/{repo}'.\n" +#~ " The " +#~ "following variables are available:\n" +#~ " {scheme}" +#~ " 'http' or 'https' sent from running" +#~ " Kallithea server,\n" +#~ " {user}" +#~ " current user username,\n" +#~ " {netloc}" +#~ " network location/server host of running" +#~ " Kallithea server,\n" +#~ " {repo}" +#~ " full repository name,\n" +#~ " {repoid}" +#~ " ID of repository, can be used " +#~ "to contruct clone-by-id" +#~ msgstr "" + +#~ msgid "enabled" +#~ msgstr "" + +#~ msgid "disabled" +#~ msgstr "" + +#~ msgid "%s Bookmarks" +#~ msgstr "" + +#~ msgid "Compare Bookmarks" +#~ msgstr "" + +#~ msgid "%s Branches" +#~ msgstr "" + +#~ msgid "Compare Branches" +#~ msgstr "" + +#~ msgid "Editing file" +#~ msgstr "" + +#~ msgid "Update" +#~ msgstr "時間" + +#~ msgid "" +#~ "Pull requests do not change once " +#~ "created. Select a revision and save " +#~ "to replace this pull request with " +#~ "a new one." +#~ msgstr "" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "" + +#~ msgid "%s Tags" +#~ msgstr "" + +#~ msgid "Compare Tags" +#~ msgstr "" +